diff --git a/travis/linux.sh b/travis/linux.sh index 63ca220..c5f1c25 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -21,14 +21,14 @@ cd jnibuild #export JAVA_HOME=/usr/lib/jvm/java-1.13.0-openjdk-amd64 #export JAVA_INCLUDE_PATH=/usr/lib/jvm/java-1.13.0-openjdk-amd64/include/ cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR} -cmake --build . --target install -- -j1 +cmake --build . --target install -- -j4 cd ../../../../../ #mvn install -X cd src/main/jni/jtdlib/build cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. .. -cmake --build . --target install -- -j1 +cmake --build . --target install -- -j4 cd .. #rm -r jnibuild #rm -r build diff --git a/travis/win.sh b/travis/win.sh index 4c7a124..caf2f6a 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -3,7 +3,7 @@ # Build deps choco install gperf choco install strawberryperl -choco install openjdk11 -params 'installdir=c:\\java11' +choco install openjdk11 cd $TRAVIS_BUILD_DIR git clone https://github.com/Microsoft/vcpkg.git @@ -48,7 +48,7 @@ mkdir $TRAVIS_BUILD_DIR/out cd jnibuild # Setup env -export JAVA_HOME="c:\\java11" +export JAVA_HOME="C:\\Program Files\\OpenJDK\\openjdk-11.0.8_10" # Build cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ${TD_SRC_DIR}