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

Update compile_td.sh, compile_tdjni.sh, and 3 more files...

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-11 03:20:34 +02:00
parent ebe6883572
commit 51382119b6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/compile_td.sh
View File

@ -56,7 +56,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
# Build # Build
echo "Compiling ${IMPLEMENTATION_NAME} td..." echo "Compiling ${IMPLEMENTATION_NAME} td..."
cmake --build . --target install ${CPU_CORES} cmake --build . --target install --config Release ${CPU_CORES}
echo "Done." echo "Done."

2
scripts/compile_tdjni.sh
View File

@ -74,7 +74,7 @@ cmake \
# Build # Build
echo "Compiling ${IMPLEMENTATION_NAME} jni..." echo "Compiling ${IMPLEMENTATION_NAME} jni..."
cmake --build . --target install ${CPU_CORES} cmake --build . --target install --config Release ${CPU_CORES}
cd .. cd ..
# Copy to resources # Copy to resources

4
scripts/generate_td_tools.sh
View File

@ -52,11 +52,11 @@ cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON ${CMAKE_EXTRA_ARGUMENTS} ../
# Run cmake to generate common tools # Run cmake to generate common tools
echo "Generating cross compilation 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 # Run cmake to generate java tools
echo "Generating 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/generate_common)'"
echo "Generated executable '$(realpath -m ./td/generate/td_generate_java_api)'" echo "Generated executable '$(realpath -m ./td/generate/td_generate_java_api)'"

2
scripts/generate_tdapi_java_file.sh
View File

@ -61,7 +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
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 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

@ -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 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 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=" " export CPU_CORES=" -- -m"
export CMAKE_BUILD_TYPE=Release export CMAKE_BUILD_TYPE=Release
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
export CMAKE_EXTRA_ARGUMENTS="" export CMAKE_EXTRA_ARGUMENTS=""