Skip to content

Commit 87639b9

Browse files
chuxipcmoritz
authored andcommitted
move make clean before cmake command, avoid always running mvn install plasma java lib (#3047)
1 parent f9b58d7 commit 87639b9

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,15 @@ fi
101101

102102
pushd "$BUILD_DIR"
103103

104+
# avoid the command failed and exits
105+
# and cmake will check some directories to determine whether some targets built
106+
make clean || true
107+
104108
cmake -DCMAKE_BUILD_TYPE=$CBUILD_TYPE \
105109
-DCMAKE_RAY_LANG_JAVA=$RAY_BUILD_JAVA \
106110
-DCMAKE_RAY_LANG_PYTHON=$RAY_BUILD_PYTHON \
107111
-DRAY_USE_NEW_GCS=$RAY_USE_NEW_GCS \
108112
-DPYTHON_EXECUTABLE:FILEPATH=$PYTHON_EXECUTABLE $ROOT_DIR
109113

110-
make clean
111114
make -j${PARALLEL}
112115
popd

cmake/Modules/ArrowExternalProject.cmake

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# - ARROW_INCLUDE_DIR
1010
# - ARROW_SHARED_LIB
1111
# - ARROW_STATIC_LIB
12+
# - ARROW_LIBRARY_DIR
1213
# - PLASMA_INCLUDE_DIR
1314
# - PLASMA_STATIC_LIB
1415
# - PLASMA_SHARED_LIB
@@ -95,12 +96,16 @@ ExternalProject_Add(arrow_ep
9596
BUILD_BYPRODUCTS "${ARROW_SHARED_LIB}" "${ARROW_STATIC_LIB}")
9697

9798
if ("${CMAKE_RAY_LANG_JAVA}" STREQUAL "YES")
98-
ExternalProject_Add_Step(arrow_ep arrow_ep_install_java_lib
99-
COMMAND bash -c "cd ${ARROW_SOURCE_DIR}/java && mvn clean install -pl plasma -am -Dmaven.test.skip > /dev/null"
100-
DEPENDEES build)
99+
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${ARROW_SOURCE_DIR}/java/target/")
100+
101+
if(NOT EXISTS ${ARROW_SOURCE_DIR}/java/target/)
102+
ExternalProject_Add_Step(arrow_ep arrow_ep_install_java_lib
103+
COMMAND bash -c "cd ${ARROW_SOURCE_DIR}/java && mvn clean install -pl plasma -am -Dmaven.test.skip > /dev/null"
104+
DEPENDEES build)
105+
endif()
101106

102107
# add install of library plasma_java, it is not configured in plasma CMakeLists.txt
103108
ExternalProject_Add_Step(arrow_ep arrow_ep_install_plasma_java
104-
COMMAND bash -c "cp ${CMAKE_CURRENT_BINARY_DIR}/external/arrow/src/arrow_ep-build/release/libplasma_java.* ${ARROW_LIBRARY_DIR}/"
109+
COMMAND bash -c "cp -rf ${CMAKE_CURRENT_BINARY_DIR}/external/arrow/src/arrow_ep-build/release/libplasma_java.* ${ARROW_LIBRARY_DIR}/"
105110
DEPENDEES install)
106111
endif ()

0 commit comments

Comments
 (0)