From d76a62c4701630cfb3a9359b374ed1159507ec92 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 18 Aug 2020 15:10:38 +0200 Subject: [PATCH] Update .travis.yml and win.sh --- .travis.yml | 8 ++++---- travis/win.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index de7d94f..acfd9e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: shell os: - linux - - osx +# - osx - windows osx_image: xcode10.1 @@ -21,9 +21,9 @@ script: | bash travis/linux.sh; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - bash travis/mac.sh; - fi +# if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then +# bash travis/mac.sh; +# fi if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then bash travis/win.sh; diff --git a/travis/win.sh b/travis/win.sh index d7c406a..ed3e193 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -44,7 +44,7 @@ cd jnibuild export JAVA_HOME="c:\\java11" # 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 @@ -52,7 +52,7 @@ 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=.. -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 cd ..