Update .travis.yml, linux.sh, and win.sh
This commit is contained in:
parent
5b3460e9d1
commit
031efa6df2
@ -15,7 +15,7 @@ addons:
|
|||||||
- gperf
|
- gperf
|
||||||
- php
|
- php
|
||||||
- cmake
|
- cmake
|
||||||
- default-jdk
|
- openjdk-11-jdk-headless
|
||||||
- g++
|
- g++
|
||||||
- ccache
|
- ccache
|
||||||
- maven
|
- maven
|
||||||
|
@ -3,6 +3,10 @@
|
|||||||
mkdir $TRAVIS_BUILD_DIR/out
|
mkdir $TRAVIS_BUILD_DIR/out
|
||||||
cd src/main/jni
|
cd src/main/jni
|
||||||
|
|
||||||
|
sudo apt-get install openjdk-11-jdk-headless
|
||||||
|
export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)"
|
||||||
|
export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)/bin"
|
||||||
|
|
||||||
export TD_SRC_DIR=${PWD}/td
|
export TD_SRC_DIR=${PWD}/td
|
||||||
export TD_BIN_DIR=${PWD}/jtdlib/td
|
export TD_BIN_DIR=${PWD}/jtdlib/td
|
||||||
export JAVA_SRC_DIR=$(dirname `pwd`)/java
|
export JAVA_SRC_DIR=$(dirname `pwd`)/java
|
||||||
@ -17,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 -- -j4
|
travis_wait 30 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 -- -j4
|
travis_wait 30 cmake --build . --target install -- -j4
|
||||||
cd ..
|
cd ..
|
||||||
#rm -r jnibuild
|
#rm -r jnibuild
|
||||||
#rm -r build
|
#rm -r build
|
||||||
|
@ -18,7 +18,7 @@ cd $TRAVIS_BUILD_DIR
|
|||||||
git clone https://github.com/Microsoft/vcpkg.git
|
git clone https://github.com/Microsoft/vcpkg.git
|
||||||
cd vcpkg
|
cd vcpkg
|
||||||
./bootstrap-vcpkg.bat
|
./bootstrap-vcpkg.bat
|
||||||
./vcpkg.exe install openssl:x64-windows zlib:x64-windows
|
travis_wait 30 ./vcpkg.exe install openssl:x64-windows zlib:x64-windows
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# openssl
|
# openssl
|
||||||
|
Loading…
Reference in New Issue
Block a user