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

Update build.sh, compile_tdjni.sh, and 2 more files...

Browse Source
This commit is contained in:
Andrea Cavalli 2020-12-27 14:05:47 +01:00
parent bcef11fb5e
commit 80adf864f0
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
github-workflows/build.sh
View File

@ -1,11 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
set -e set -e
cd ./scripts/ cd ./scripts/
./generate_maven_project.sh source ./generate_maven_project.sh
./generate_td_tools.sh source ./generate_td_tools.sh
./compile_td.sh source ./compile_td.sh
./compile_tdjni.sh source ./compile_tdjni.sh
./build_generated_maven_project.sh source ./build_generated_maven_project.sh
echo "Done." echo "Done."
exit 0 exit 0

8
scripts/compile_tdjni.sh
View File

@ -57,7 +57,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 [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
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/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)
@ -87,11 +87,11 @@ cd ..
# Copy to resources # Copy to resources
echo "Copying to resources..." echo "Copying to resources..."
[ -d ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ ] || mkdir -p ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ [ -d ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ ] || mkdir -p ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
cp ./tdjni_bin/tdjni.dll ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dll cp ./tdjni_bin/tdjni.dll ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dll
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dylib cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dylib
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
cp ./tdjni_bin/libtdjni.so ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.so cp ./tdjni_bin/libtdjni.so ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.so
fi fi

6
scripts/generate_tdapi_java_file.sh
View File

@ -36,7 +36,7 @@ echo "CPU cores count: ${CPU_CORES}"
echo "CMake extra arguments: '${CMAKE_EXTRA_ARGUMENTS}'" echo "CMake extra arguments: '${CMAKE_EXTRA_ARGUMENTS}'"
# Setup constants # Setup constants
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
export PYTHON_EXECUTABLE="python" export PYTHON_EXECUTABLE="python"
else else
export PYTHON_EXECUTABLE="python3" export PYTHON_EXECUTABLE="python3"
@ -68,7 +68,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 [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
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/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)
@ -105,7 +105,7 @@ cd ..
echo "Patching TdApi.java..." echo "Patching TdApi.java..."
${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) ${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
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
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
else else
unexpand -t 2 ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java > ./src/main/jni-java-src/it/tdlight/jni/TdApi.java unexpand -t 2 ./src/main/jni-java-src/it/tdlight/jni/new_TdApi.java > ./src/main/jni-java-src/it/tdlight/jni/TdApi.java

10
scripts/run-all.sh
View File

@ -5,11 +5,11 @@
# IMPLEMENTATION_NAME = <tdlib | tdlight> # IMPLEMENTATION_NAME = <tdlib | tdlight>
# CPU_CORES = <cores> # CPU_CORES = <cores>
./generate_maven_project.sh source ./generate_maven_project.sh
./generate_td_tools.sh source ./generate_td_tools.sh
./compile_td.sh source ./compile_td.sh
./compile_tdjni.sh source ./compile_tdjni.sh
./build_generated_maven_project.sh source ./build_generated_maven_project.sh
echo "Done." echo "Done."
exit 0 exit 0