tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Update .gitignore, install_dependencies.sh, and setup_variables.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-10 22:52:29 +02:00
parent ad09e49dcc
commit add557cd51
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -52,3 +52,4 @@ buildNumber.properties
.mvn/wrapper/maven-wrapper.jar .mvn/wrapper/maven-wrapper.jar
/generated/ /generated/
/vcpkg/

1
travis/install_dependencies.sh
View File

@ -31,6 +31,7 @@ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""' choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""'
choco install python3 --params "/InstallDir:C:\Python3" choco install python3 --params "/InstallDir:C:\Python3"
[ -d ./windowsenv/ ] && rm -rf ./windowsenv/
git clone --depth=1 https://github.com/tdlight-team/windows-amd64-prebuilt-libraries.git windowsenv git clone --depth=1 https://github.com/tdlight-team/windows-amd64-prebuilt-libraries.git windowsenv
mv windowsenv/vcpkg $VCPKG_DIR mv windowsenv/vcpkg $VCPKG_DIR
else else

2
travis/setup_variables.sh
View File

@ -26,7 +26,7 @@ echo "============================="
# ====== OS Variables # ====== OS Variables
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export VCPKG_DIR="$(realpath .)/generated/vcpkg" export VCPKG_DIR="$(realpath .)/vcpkg"
export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake" export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
export PATH="$PATH:/c/tools/php74:/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 PATH="$PATH:/c/tools/php74:/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 JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10"