Skip to content

Commit ec44803

Browse files
committed
ARROW-17427: [Java] Add Windows build script that produces DLLs (apache#14203)
Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 20058d6 commit ec44803

File tree

9 files changed

+21
-10
lines changed

9 files changed

+21
-10
lines changed

adapter/orc/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,6 @@ set_property(TARGET arrow_java_jni_orc PROPERTY OUTPUT_NAME "arrow_orc_jni")
3737
target_link_libraries(arrow_java_jni_orc arrow_java_jni_orc_headers jni
3838
Arrow::arrow_static)
3939

40-
install(TARGETS arrow_java_jni_orc DESTINATION ${CMAKE_INSTALL_LIBDIR})
40+
install(TARGETS arrow_java_jni_orc
41+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
42+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

adapter/orc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<scope>compile</scope>
3333
<classifier>${arrow.vector.classifier}</classifier>
3434
</dependency>
35-
<dependency>
35+
<dependency>
3636
<groupId>org.apache.orc</groupId>
3737
<artifactId>orc-core</artifactId>
3838
<version>1.7.6</version>
@@ -122,7 +122,7 @@
122122
<resource>
123123
<directory>${arrow.cpp.build.dir}</directory>
124124
<includes>
125-
<include>**/libarrow_orc_jni.*</include>
125+
<include>**/*arrow_orc_jni.*</include>
126126
</includes>
127127
</resource>
128128
</resources>

c/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ add_library(arrow_java_jni_cdata SHARED src/main/cpp/jni_wrapper.cc)
3030
set_property(TARGET arrow_java_jni_cdata PROPERTY OUTPUT_NAME "arrow_cdata_jni")
3131
target_link_libraries(arrow_java_jni_cdata arrow_java_jni_cdata_headers jni)
3232

33-
install(TARGETS arrow_java_jni_cdata DESTINATION ${CMAKE_INSTALL_LIBDIR})
33+
install(TARGETS arrow_java_jni_cdata
34+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
35+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

dataset/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@ if(BUILD_TESTING)
4242
add_test(NAME arrow-java-jni-dataset-test COMMAND arrow-java-jni-dataset-test)
4343
endif()
4444

45-
install(TARGETS arrow_java_jni_dataset DESTINATION ${CMAKE_INSTALL_LIBDIR})
45+
install(TARGETS arrow_java_jni_dataset
46+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
47+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

dataset/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<resource>
148148
<directory>${arrow.cpp.build.dir}</directory>
149149
<includes>
150-
<include>**/libarrow_dataset_jni.*</include>
150+
<include>**/*arrow_dataset_jni.*</include>
151151
</includes>
152152
</resource>
153153
</resources>

dataset/src/main/cpp/jni_wrapper.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
9191
return std::make_shared<arrow::dataset::ParquetFileFormat>();
9292
case 1:
9393
return std::make_shared<arrow::dataset::IpcFileFormat>();
94+
#ifdef ARROW_ORC
9495
case 2:
9596
return std::make_shared<arrow::dataset::OrcFileFormat>();
97+
#endif
9698
default:
9799
std::string error_message =
98100
"illegal file format id: " + std::to_string(file_format_id);

gandiva/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,6 @@ if(CXX_LINKER_SUPPORTS_VERSION_SCRIPT)
8787
)
8888
endif()
8989

90-
install(TARGETS arrow_java_jni_gandiva DESTINATION ${CMAKE_INSTALL_LIBDIR})
90+
install(TARGETS arrow_java_jni_gandiva
91+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
92+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

gandiva/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@
115115
<resource>
116116
<directory>${arrow.cpp.build.dir}</directory>
117117
<includes>
118-
<include>**/gandiva_jni.*</include>
119-
<include>**/libgandiva_jni.*</include>
118+
<include>**/*gandiva_jni.*</include>
120119
</includes>
121120
</resource>
122121
</resources>

plasma/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@ if(APPLE)
3838
"-undefined dynamic_lookup")
3939
endif()
4040

41-
install(TARGETS arrow_java_jni_plasma DESTINATION ${CMAKE_INSTALL_LIBDIR})
41+
install(TARGETS arrow_java_jni_plasma
42+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
43+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

0 commit comments

Comments
 (0)