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

Update linux.sh and win.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-08-19 02:11:35 +02:00
parent 1fd4b7cbd8
commit 16e6674ef8
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
travis/linux.sh
View File

@ -17,7 +17,7 @@ echo "TD_BIN_DIR=${TD_BIN_DIR}"
echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}" echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}"
# ====== Environment setup # ====== Environment setup
mkdir -p $TRAVIS_BUILD_DIR/out mkdir -p $TRAVIS_BUILD_DIR/out || true
mkdir $TD_BUILD_DIR || true mkdir $TD_BUILD_DIR || true
mkdir $TDNATIVES_CPP_BUILD_DIR || true mkdir $TDNATIVES_CPP_BUILD_DIR || true

31
travis/win.sh
View File

@ -25,8 +25,7 @@ rm $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java || true
rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java || true rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java || true
# ====== Environment setup # ====== Environment setup
mkdir -p $TRAVIS_BUILD_DIR/out mkdir -p $TRAVIS_BUILD_DIR/out || true
mkdir $TRAVIS_BUILD_DIR/out
mkdir $TD_BUILD_DIR || true mkdir $TD_BUILD_DIR || true
mkdir $TDNATIVES_CPP_BUILD_DIR || true mkdir $TDNATIVES_CPP_BUILD_DIR || true
choco install openjdk11 --version=11.0.8.10 choco install openjdk11 --version=11.0.8.10
@ -37,19 +36,35 @@ choco install strawberryperl
# Install OpenSSL and ZLib # Install OpenSSL and ZLib
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
git clone https://github.com/Microsoft/vcpkg.git # openssl
cd vcpkg mkdir $TRAVIS_BUILD_DIR/openssl-root
cmd /c bootstrap-vcpkg.bat git clone https://github.com/openssl/openssl.git -b OpenSSL_1_1_1-stable
./vcpkg.exe install openssl:x64-windows zlib:x64-windows cd openssl
perl Configure enable-static-engine enable-capieng no-ssl2 -utf-8 VC-WIN64A --prefix=$TRAVIS_BUILD_DIR/openssl-root --openssldir=$TRAVIS_BUILD_DIR/openssl-root no-shared
nmake
nmake install
cd ..
# zlib
cd $TRAVIS_BUILD_DIR
mkdir $TRAVIS_BUILD_DIR/zlib-root
git clone https://github.com/madler/zlib.git -b v1.2.11
cd zlib
cmake -DCMAKE_INSTALL_PREFIX:PATH=$TRAVIS_BUILD_DIR/zlib-root -DSKIP_BUILD_EXAMPLES=ON .
cmake --build . --target install
cd ..
ls $TRAVIS_BUILD_DIR/openssl-root
ls $TRAVIS_BUILD_DIR/zlib-root
# ====== Build Td # ====== Build Td
cd $TD_BUILD_DIR cd $TD_BUILD_DIR
cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ${TD_SRC_DIR} cmake -A x64 -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
# ====== Build TdNatives # ====== Build TdNatives
cd $TDNATIVES_CPP_BUILD_DIR cd $TDNATIVES_CPP_BUILD_DIR
cmake -A x64 -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 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake $TDNATIVES_CPP_SRC_DIR cmake -A x64 -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
# ====== Copy output # ====== Copy output