From 51382119b69fe55f18fc4d376bfbb3846b631713 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 11 Oct 2020 03:20:34 +0200 Subject: [PATCH] Update compile_td.sh, compile_tdjni.sh, and 3 more files... --- scripts/compile_td.sh | 2 +- scripts/compile_tdjni.sh | 2 +- scripts/generate_td_tools.sh | 4 ++-- scripts/generate_tdapi_java_file.sh | 2 +- travis/setup_variables.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/compile_td.sh b/scripts/compile_td.sh index 5d11ef9..027ee6b 100755 --- a/scripts/compile_td.sh +++ b/scripts/compile_td.sh @@ -56,7 +56,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ # Build echo "Compiling ${IMPLEMENTATION_NAME} td..." -cmake --build . --target install ${CPU_CORES} +cmake --build . --target install --config Release ${CPU_CORES} echo "Done." diff --git a/scripts/compile_tdjni.sh b/scripts/compile_tdjni.sh index f33d55b..decb5c5 100755 --- a/scripts/compile_tdjni.sh +++ b/scripts/compile_tdjni.sh @@ -74,7 +74,7 @@ cmake \ # Build echo "Compiling ${IMPLEMENTATION_NAME} jni..." -cmake --build . --target install ${CPU_CORES} +cmake --build . --target install --config Release ${CPU_CORES} cd .. # Copy to resources diff --git a/scripts/generate_td_tools.sh b/scripts/generate_td_tools.sh index de0dc3e..9e2dcdb 100755 --- a/scripts/generate_td_tools.sh +++ b/scripts/generate_td_tools.sh @@ -52,11 +52,11 @@ cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON ${CMAKE_EXTRA_ARGUMENTS} ../ # Run cmake to generate common tools echo "Generating cross compilation tools..." -cmake --build . --target prepare_cross_compiling ${CPU_CORES} +cmake --build . --target prepare_cross_compiling --config Release ${CPU_CORES} # Run cmake to generate java tools echo "Generating java tools..." -cmake --build . --target td_generate_java_api ${CPU_CORES} +cmake --build . --target td_generate_java_api --config Release ${CPU_CORES} echo "Generated executable '$(realpath -m ./td/generate/generate_common)'" echo "Generated executable '$(realpath -m ./td/generate/td_generate_java_api)'" diff --git a/scripts/generate_tdapi_java_file.sh b/scripts/generate_tdapi_java_file.sh index ad15200..b6d8371 100755 --- a/scripts/generate_tdapi_java_file.sh +++ b/scripts/generate_tdapi_java_file.sh @@ -61,7 +61,7 @@ cp -r ./src/main/jni-java-src ./generated/src/main/jni-java-src # Copy executables echo "Copying executables..." if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate/Debug) + export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate/Release) else export TD_GENERATED_BINARIES_DIR=$(realpath -m ./generated/td_tools/td/generate) fi diff --git a/travis/setup_variables.sh b/travis/setup_variables.sh index 6bd1c29..e44c30a 100755 --- a/travis/setup_variables.sh +++ b/travis/setup_variables.sh @@ -30,7 +30,7 @@ if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DOPENSSL_USE_STATIC_LIBS=ON" 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 CPU_CORES=" " + export CPU_CORES=" -- -m" export CMAKE_BUILD_TYPE=Release elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CMAKE_EXTRA_ARGUMENTS=""