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

Update .travis.yml and win.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-08-18 15:10:38 +02:00
parent d98aa22fcf
commit d76a62c470
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -2,7 +2,7 @@ language: shell
os: os:
- linux - linux
- osx # - osx
- windows - windows
osx_image: xcode10.1 osx_image: xcode10.1
@ -21,9 +21,9 @@ script: |
bash travis/linux.sh; bash travis/linux.sh;
fi fi
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then # if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
bash travis/mac.sh; # bash travis/mac.sh;
fi # fi
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
bash travis/win.sh; bash travis/win.sh;

4
travis/win.sh
View File

@ -44,7 +44,7 @@ cd jnibuild
export JAVA_HOME="c:\\java11" export JAVA_HOME="c:\\java11"
# Build # Build
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR\vcpkg\scripts\buildsystems\vcpkg.cmake ${TD_SRC_DIR} cmake -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 --build . --target install -- -j4 cmake --build . --target install -- -j4
@ -52,7 +52,7 @@ 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=.. -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR\vcpkg\scripts\buildsystems\vcpkg.cmake .. cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\vcpkg\scripts\buildsystems\vcpkg.cmake ..
cmake --build . --target install -- -j4 cmake --build . --target install -- -j4
cd .. cd ..