From f05cbe18a64e18ecf43de17d8cd015fffdc1fd0f Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 10 Oct 2020 03:36:01 +0200 Subject: [PATCH] Update clean-all.sh, compile_tdjni.sh, and generate_tdapi_java_file.sh --- scripts/clean-all.sh | 8 ++++++++ scripts/compile_tdjni.sh | 4 ++-- scripts/generate_tdapi_java_file.sh | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100755 scripts/clean-all.sh diff --git a/scripts/clean-all.sh b/scripts/clean-all.sh new file mode 100755 index 0000000..30e05d2 --- /dev/null +++ b/scripts/clean-all.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e + +cd ../ + +rm -r generated + +echo "Done." +exit 0 diff --git a/scripts/compile_tdjni.sh b/scripts/compile_tdjni.sh index 2cdd5b9..96d99a0 100755 --- a/scripts/compile_tdjni.sh +++ b/scripts/compile_tdjni.sh @@ -48,8 +48,8 @@ echo "Creating missing folders..." # Copy source files 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-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 diff --git a/scripts/generate_tdapi_java_file.sh b/scripts/generate_tdapi_java_file.sh index f183979..5ba9968 100755 --- a/scripts/generate_tdapi_java_file.sh +++ b/scripts/generate_tdapi_java_file.sh @@ -51,8 +51,8 @@ echo "Creating missing folders..." # Copy source files 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-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 # Configure cmake