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

Update generate_tdapi_java_file.sh and setup_variables.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-11 00:58:04 +02:00
parent ab55cfec89
commit 4f214957c7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/generate_tdapi_java_file.sh
View File

@ -61,8 +61,7 @@ cp -r ./src/main/jni-java-src ./generated/src/main/jni-java-src
# Copy executables # Copy executables
echo "Copying executables..." echo "Copying executables..."
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
cp $(realpath -m ./generated/td_tools/td/generate/Debug/td_generate_java_api.exe) $(realpath -m ./generated/td_tools/td/generate/Debug/td_generate_java_api) export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate/Release)
export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate/Debug)
else else
export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate) export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate)
fi fi

2
travis/setup_variables.sh
View File

@ -27,7 +27,7 @@ echo "============================="
# ====== OS Variables # ====== OS Variables
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export VCPKG_DIR="$(realpath .)/vcpkg" export VCPKG_DIR="$(realpath .)/vcpkg"
export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows" export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_CONFIGURATION_TYPES=Release -DVCPKG_BUILD_TYPE=release"
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"
export CPU_CORES=" -- -m" export CPU_CORES=" -- -m"