tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Update linux.sh and win.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-08-18 16:05:21 +02:00
parent fe3045cae0
commit 799dc8f7fc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
travis/linux.sh
View File

@ -21,14 +21,14 @@ cd jnibuild
#export JAVA_HOME=/usr/lib/jvm/java-1.13.0-openjdk-amd64 #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/ #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 -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 ../../../../../ cd ../../../../../
#mvn install -X #mvn install -X
cd src/main/jni/jtdlib/build 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 -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 .. cd ..
#rm -r jnibuild #rm -r jnibuild
#rm -r build #rm -r build

4
travis/win.sh
View File

@ -3,7 +3,7 @@
# Build deps # Build deps
choco install gperf choco install gperf
choco install strawberryperl choco install strawberryperl
choco install openjdk11 -params 'installdir=c:\\java11' choco install openjdk11
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
git clone https://github.com/Microsoft/vcpkg.git git clone https://github.com/Microsoft/vcpkg.git
@ -48,7 +48,7 @@ mkdir $TRAVIS_BUILD_DIR/out
cd jnibuild cd jnibuild
# Setup env # Setup env
export JAVA_HOME="c:\\java11" export JAVA_HOME="C:\\Program Files\\OpenJDK\\openjdk-11.0.8_10"
# Build # 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} 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}