Clean

apache · Aug 20, 2022 · 9aa3513 · 9aa3513
1 parent baa748c
commit 9aa3513
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ci/scripts/java_jni_build.sh b/ci/scripts/java_jni_build.sh
@@ -45,14 +45,14 @@ case "$(uname)" in
     ;;
 esac
 
-: ${CMKAE_BUILD_TYPE:=Release}
-# TODO: Remove the last "/arrow" from -DCMAKE_INSTALL_PREFIX when
+: ${CMKAE_BUILD_TYPE:=release}
+# TODO: Remove the last "/arrow" from -DCMAKE_PREFIX_PATH when
 # we resolve ARROW-12175 / https://github.com/apache/arrow/pull/13892 .
 cmake \
   -DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_DATASET:-ON} \
   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-  -DCMAKE_PREFIX_PATH=${dist_dir} \
-  -DCMAKE_INSTALL_PREFIX=${arrow_install_dir}/lib/cmake/arrow \
+  -DCMAKE_PREFIX_PATH=${arrow_install_dir}/lib/cmake/arrow \
+  -DCMAKE_INSTALL_PREFIX=${dist_dir} \
   -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
   -GNinja \
   ${JAVA_JNI_CMAKE_ARGS:-} \

diff --git a/ci/scripts/java_jni_manylinux_build.sh b/ci/scripts/java_jni_manylinux_build.sh
@@ -24,8 +24,6 @@ build_dir=${2}
 # The directory where the final binaries will be stored when scripts finish
 dist_dir=${3}
 
-INSTALL_DIR=${build_dir}/cpp-install
-
 echo "=== Clear output directories and leftovers ==="
 # Clear output directories and leftovers
 rm -rf ${build_dir}
@@ -123,7 +121,7 @@ popd
 
 
 JAVA_JNI_CMAKE_ARGS=""
-JAVA_JNI_CMAKE_ARGS="${JAVA_JNI_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake"
+JAVA_JNI_CMAKE_ARGS="${JAVA_JNI_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
 JAVA_JNI_CMAKE_ARGS="${JAVA_JNI_CMAKE_ARGS} -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}"
 export JAVA_JNI_CMAKE_ARGS
 ${arrow_dir}/ci/scripts/java_jni_build.sh \