From fa5d81ece9bb2d5656d875b0b28abed3057458bb Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 19 Aug 2020 17:01:43 +0200 Subject: [PATCH] Update deploy_master.sh and linux.sh --- travis/deploy_master.sh | 8 ++++---- travis/linux.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index 16b61aa..858f430 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -65,11 +65,11 @@ cd "tdlight-java-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD" SRC_LIBNAME="" LIBNAME="" if [ "$TRAVIS_OS_NAME_STANDARD" = "windows" ]; then - SRC_LIBNAME="libtdjni.dll" - LIBNAME="tdjni.dll" + export SRC_LIBNAME="libtdjni.dll" + export LIBNAME="tdjni.dll" else - SRC_LIBNAME="libtdjni.so" - LIBNAME="tdjni.so" + export SRC_LIBNAME="libtdjni.so" + export LIBNAME="tdjni.so" fi mkdir -p "src/main/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVIS_CPU_ARCH_STANDARD" mv "$TRAVIS_BUILD_DIR/out/$SRC_LIBNAME" "src/main/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVIS_CPU_ARCH_STANDARD/$LIBNAME" diff --git a/travis/linux.sh b/travis/linux.sh index 28ef193..257079c 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -38,12 +38,12 @@ echo "JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}" # ====== Build Td cd $TD_BUILD_DIR cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR} -cmake --build $TD_BUILD_DIR --target install +cmake --build $TD_BUILD_DIR --target install -- -n4 # ====== Build TdNatives cd $TDNATIVES_CPP_BUILD_DIR cmake -DCMAKE_BUILD_TYPE=Release -DTD_BIN_DIR=${TD_BIN_DIR} -DTDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR} -DTDNATIVES_DOCS_BIN_DIR=${TDNATIVES_DOCS_BIN_DIR} -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DTDNATIVES_CPP_SRC_DIR:PATH=$TDNATIVES_CPP_SRC_DIR $TDNATIVES_CPP_SRC_DIR -cmake --build $TDNATIVES_CPP_BUILD_DIR --target install +cmake --build $TDNATIVES_CPP_BUILD_DIR --target install -- -n4 mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so mv $TDNATIVES_DOCS_BIN_DIR $TRAVIS_BUILD_DIR/out/docs