Update compile_tdjni.sh, run-all.sh, and build.sh

This commit is contained in:
Andrea Cavalli 2020-10-11 13:32:35 +02:00
parent 7304616b19
commit 4301380190
3 changed files with 3 additions and 6 deletions

View File

@ -54,7 +54,6 @@ echo "Copying source files..."
cp -r ./src/main/jni-cpp-src/common/. ./generated/src/main/jni-cpp-src
cp -r ./src/main/jni-cpp-src/${IMPLEMENTATION_NAME}/. ./generated/src/main/jni-cpp-src
cp -r ./src/main/jni-java-src ./generated/src/main/jni-java-src
cp ./generated/src/main/java/it/tdlight/jni/TdApi.java ./generated/src/main/jni-java-src/it/tdlight/jni/TdApi.java
# Copy executables
echo "Copying executables..."
@ -74,11 +73,11 @@ cmake \
-DTDNATIVES_BIN_DIR=$(realpath -m ../tdjni_bin/) \
-DTDNATIVES_DOCS_BIN_DIR=$(realpath -m ../tdjni_docs/) \
-DTd_DIR=$(realpath -m ../td_bin/lib/cmake/Td/) \
-DJAVA_SRC_DIR=$(realpath -m ../src/main/jni-java-src/) \
-DTDNATIVES_CPP_SRC_DIR:PATH=$(realpath -m ../src/main/jni-cpp-src/) \
-DJAVA_SRC_DIR=$(realpath -m ../generated/src/main/jni-java-src/) \
-DTDNATIVES_CPP_SRC_DIR:PATH=$(realpath -m ../generated/src/main/jni-cpp-src/) \
-DOPENSSL_USE_STATIC_LIBS=True \
${CMAKE_EXTRA_ARGUMENTS} \
$(realpath -m ../src/main/jni-cpp-src/)
$(realpath -m ../generated/src/main/jni-cpp-src/)
# Build
echo "Compiling ${IMPLEMENTATION_NAME} jni..."

View File

@ -8,7 +8,6 @@
./generate_maven_project.sh
./generate_td_tools.sh
./compile_td.sh
./generate_tdapi_java_file.sh
./compile_tdjni.sh
./build_generated_maven_project.sh

View File

@ -10,7 +10,6 @@ cd ./scripts/
./generate_maven_project.sh
./generate_td_tools.sh
./compile_td.sh
./generate_tdapi_java_file.sh
./compile_tdjni.sh
./build_generated_maven_project.sh