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

Update install_dependencies.sh and setup_variables.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-11 10:40:31 +02:00
parent 296d61625a
commit e802cdc194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
travis/install_dependencies.sh
View File

@ -18,6 +18,10 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
sudo port select --set pip pip$PYTHON; sudo port select --set pip pip$PYTHON;
pip install pyinstaller --user; pip install pyinstaller --user;
export PATH=$PATH:$(python3 -c "import site; print(site.USER_BASE)")/bin; export PATH=$PATH:$(python3 -c "import site; print(site.USER_BASE)")/bin;
xcode-select --install
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
brew install gperf cmake openssl coreutils
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
echo "==Windows==" echo "==Windows=="
choco install ccache choco install ccache

1
travis/setup_variables.sh
View File

@ -38,7 +38,6 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
export JAVA_HOME="$(/usr/libexec/java_home -v 14)" export JAVA_HOME="$(/usr/libexec/java_home -v 14)"
export JAVA_INCLUDE_PATH="$(/usr/libexec/java_home -v 14)/include" export JAVA_INCLUDE_PATH="$(/usr/libexec/java_home -v 14)/include"
export CPU_CORES=" -- -j${CPU_CORES_NUM}" export CPU_CORES=" -- -j${CPU_CORES_NUM}"
export CXXFLAGS="-stdlib=libstdc++"
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
export CMAKE_EXTRA_ARGUMENTS="" export CMAKE_EXTRA_ARGUMENTS=""
export TRAVIS_CPU_ARCH_JAVA="$(tr '[:upper:]' '[:lower:]'<<<"${TRAVIS_CPU_ARCH}")" export TRAVIS_CPU_ARCH_JAVA="$(tr '[:upper:]' '[:lower:]'<<<"${TRAVIS_CPU_ARCH}")"