Update .travis.yml, build.sh, and 2 more files...

This commit is contained in:
Andrea Cavalli 2020-08-19 21:27:20 +02:00
parent 983f92d77e
commit 204d5b345c
4 changed files with 8 additions and 2 deletions

View File

@ -30,6 +30,7 @@ addons:
- maven
- openjdk-11-jdk
- python3
- php7.4-cli
cache:
bundler: true
cocoapods: true
@ -55,5 +56,5 @@ deploy:
# script: "mvn -B -V deploy"
install: ./travis/install_dependencies.sh
script: travis_wait 30 ./travis/build.sh
script: ./travis/build.sh
after_success: ./travis/build_success.sh

View File

@ -5,6 +5,10 @@ set -e
source ./travis/setup_variables.sh
# ====== Build Td
# Split sources
cd $TD_SRC_DIR
php SplitSource.php
# Build
cd $TD_BUILD_DIR
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR}

View File

@ -25,6 +25,7 @@ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
choco install gperf
choco install strawberryperl
choco install nasm
choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""'
git clone --depth=1 -b windows-amd64-prebuilt-libraries --single-branch https://github.com/tdlight-team/tdlight-java windowsenv
mv windowsenv/vcpkg $VCPKG_DIR

View File

@ -38,7 +38,7 @@ fi
# ====== OS Variables
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/Program Files/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM"
export PATH="$PATH:/c/PHP:/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/Program Files/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM"
export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10"
export VCPKG_DIR=$TRAVIS_BUILD_DIR/vcpkg
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then