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 12:54:45 +02:00
parent a62a93508c
commit 430140cca1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
travis/deploy_master.sh
View File

@ -91,7 +91,9 @@ if ! (git diff --exit-code "src/main/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVI
# Upgrade the dependency of tdlight-java # Upgrade the dependency of tdlight-java
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true
cd tdlight-java cd $TRAVIS_BUILD_DIR/tdlight-java
git checkout master
git pull
mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD
rm pom.xml.versionsBackup rm pom.xml.versionsBackup
git add pom.xml git add pom.xml
@ -114,13 +116,15 @@ if [ "$TRAVIS_OS_NAME_STANDARD" = "linux" ]; then
# Upgrade the file of tdlight-java # Upgrade the file of tdlight-java
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git || true
cd tdlight-java cd $TRAVIS_BUILD_DIR/tdlight-java
git pull git checkout master
cp $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java src/main/java/it/tdlight/tdnatives/TdApi.java git pull
cp $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java $TRAVIS_BUILD_DIR/tdlight-java/src/main/java/it/tdlight/tdnatives/TdApi.java
# IF TdApi.java IS CHANGED # IF TdApi.java IS CHANGED
if ! (git diff --exit-code "$JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java"); then if ! (git diff --exit-code "$JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java"); then
# Upgrade TdApi.java in repository master # Upgrade TdApi.java in repository master
cd $TRAVIS_BUILD_DIR/tdlight-java
git add src/main/java/it/tdlight/tdnatives/TdApi.java git add src/main/java/it/tdlight/tdnatives/TdApi.java
git commit -m "Upgraded TdApi.java" git commit -m "Upgraded TdApi.java"
git push git push

4
travis/linux.sh
View File

@ -38,12 +38,12 @@ echo "JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}"
# ====== Build Td # ====== Build Td
cd $TD_BUILD_DIR cd $TD_BUILD_DIR
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_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 -- -j2 cmake --build $TD_BUILD_DIR --target install
# ====== Build TdNatives # ====== Build TdNatives
cd $TDNATIVES_CPP_BUILD_DIR 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 -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 -- -j2 cmake --build $TDNATIVES_CPP_BUILD_DIR --target install
mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so
mv $TDNATIVES_DOCS_BIN_DIR $TRAVIS_BUILD_DIR/out/docs mv $TDNATIVES_DOCS_BIN_DIR $TRAVIS_BUILD_DIR/out/docs