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 10:21:29 +02:00
parent d65297916d
commit 296d61625a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/generate_tdapi_java_file.sh
View File

@ -35,6 +35,14 @@ echo "Td implementation: ${IMPLEMENTATION_NAME}"
echo "CPU cores count: ${CPU_CORES}" echo "CPU cores count: ${CPU_CORES}"
echo "CMake extra arguments: '${CMAKE_EXTRA_ARGUMENTS}'" echo "CMake extra arguments: '${CMAKE_EXTRA_ARGUMENTS}'"
# Setup constants
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
export PYTHON_EXECUTABLE="python"
else
export PYTHON_EXECUTABLE="python3"
fi
# Delete old data # Delete old data
echo "Deleting old data..." echo "Deleting old data..."
[ -d ./generated/tdapi_java_build/ ] && rm -r ./generated/tdapi_java_build/ [ -d ./generated/tdapi_java_build/ ] && rm -r ./generated/tdapi_java_build/
@ -95,7 +103,7 @@ cmake --build . --target td_generate_java_api --config Release ${CPU_CORES}
cd .. cd ..
echo "Patching TdApi.java..." echo "Patching TdApi.java..."
python3 ../tdlib-serializer/ $(realpath -m ./src/main/jni-java-src/it/tdlight/jni/TdApi.java) $(realpath -m ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java) $(realpath -m ../tdlib-serializer/headers.txt) ${PYTHON_EXECUTABLE} ../tdlib-serializer/ $(realpath -m ./src/main/jni-java-src/it/tdlight/jni/TdApi.java) $(realpath -m ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java) $(realpath -m ../tdlib-serializer/headers.txt)
rm ./src/main/jni-java-src/it/tdlight/jni/TdApi.java rm ./src/main/jni-java-src/it/tdlight/jni/TdApi.java
unexpand --tabs=2 ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java > ./src/main/jni-java-src/it/tdlight/jni/TdApi.java unexpand --tabs=2 ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java > ./src/main/jni-java-src/it/tdlight/jni/TdApi.java
rm ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java rm ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java

3
travis/setup_variables.sh
View File

@ -38,8 +38,7 @@ 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=libc++" export CXXFLAGS="-stdlib=libstdc++"
export CFLAGS="-stdlib=libc++"
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}")"