forked from ErnyTech/JTDLib
Update .travis.yml and win.sh
This commit is contained in:
parent
d98aa22fcf
commit
d76a62c470
@ -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;
|
||||
|
@ -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 ..
|
||||
|
Reference in New Issue
Block a user