From 68edb3393cc31586e06629a28acb8f90a503826f Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 27 Apr 2023 18:10:51 +0200 Subject: [PATCH] Bugfixes --- Dockerfile | 3 --- scripts/core/compile_tdjni.sh | 8 ++++---- scripts/core/deploy_release.sh | 2 +- scripts/core/deploy_snapshot.sh | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6a341f..8f42505 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,4 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ --mount=target=/var/cache/crossbuild-deps,type=cache,sharing=locked \ /bin/bash /usr/src/tdlight-java-natives/scripts/continuous-integration/docker/build-natives.sh -#WORKDIR /usr/src/tdlight-java-natives/generated/ -#RUN echo "aaaa" > test.txt - ENTRYPOINT [ "/bin/bash" ] diff --git a/scripts/core/compile_tdjni.sh b/scripts/core/compile_tdjni.sh index 69bf8bb..3f27377 100755 --- a/scripts/core/compile_tdjni.sh +++ b/scripts/core/compile_tdjni.sh @@ -119,13 +119,13 @@ cd .. # Copy to resources echo "Copying to resources..." -[ -d ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ ] || mkdir -p ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ +[ -d ./src/main/resources/META-INF/tdlight-jni/ ] || mkdir -p ./src/main/resources/META-INF/tdlight-jni/ if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then - cp ./tdjni_bin/tdjni.dll ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dll + cp ./tdjni_bin/tdjni.dll ./src/main/resources/META-INF/tdlight-jni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.dll elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then - cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dylib + cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/META-INF/tdlight-jni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.dylib elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then - cp ./tdjni_bin/libtdjni.so ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.so + cp ./tdjni_bin/libtdjni.so ./src/main/resources/META-INF/tdlight-jni/tdjni-${OPERATING_SYSTEM_NAME_SHORT}-${CPU_ARCHITECTURE_NAME}.so fi echo "Done." diff --git a/scripts/core/deploy_release.sh b/scripts/core/deploy_release.sh index cc87601..1d870c2 100755 --- a/scripts/core/deploy_release.sh +++ b/scripts/core/deploy_release.sh @@ -28,7 +28,7 @@ else cd "../../generated-${API_TYPE}" fi -mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" -Dssl3=${USE_SSL3} "-D${API_TYPE:-${FALLBACK_API_TYPE}}" clean deploy +mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" -Dssl3=${USE_SSL3} "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy echo "Done." exit 0 diff --git a/scripts/core/deploy_snapshot.sh b/scripts/core/deploy_snapshot.sh index f218a24..9f24efd 100755 --- a/scripts/core/deploy_snapshot.sh +++ b/scripts/core/deploy_snapshot.sh @@ -19,7 +19,7 @@ if [ "${SSL_TYPE:-${FALLBACK_SSL_TYPE}}" != "ssl1" ]; then fi REVISION_MVN="4.0.0${REVISION_SUFFIX}" -mvn -B -Drevision="${REVISION_MVN}" -Dssl3=${USE_SSL3} -DsafeVersionName="${SAFE_VERSION_NAME}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy +mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" -Dssl3=${USE_SSL3} "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy echo "Done." exit 0