tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Update deploy_master.sh and linux.sh

Browse Source
This commit is contained in:
Andrea 2020-08-19 17:01:43 +02:00
parent 9c3a0237a7
commit fa5d81ece9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
travis/deploy_master.sh
View File

@ -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"

4
travis/linux.sh
View File

@ -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