tdlight-team/tdlight-java-natives-linux-aarch64
1
0
Fork 0
Code Releases Activity

Fix cross compilation

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-06 19:48:06 +02:00
parent 5f0088b6b7
commit 51f40875f3
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jenkins/scripts/cross_compile.sh
View File

@ -16,7 +16,7 @@ TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/toolchain-arm64.cmake
# ====== Prepare TdLib
# Cross compilation preparation (also needed for split sources)
cd $TD_BUILD_DIR
nice -n 5 \
nice -n 5 chrt -b 0 \
cmake \
-DCMAKE_CROSSCOMPILING=ON \
-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
@ -34,19 +34,19 @@ nice -n 5 \
# Split sources
cd $TD_SRC_DIR
nice -n 5 php SplitSource.php
nice -n 5 chrt -b 0 php SplitSource.php
# Build
cd $TD_BUILD_DIR
nice -n 5 cmake --build $TD_BUILD_DIR --target install --parallel ${TRAVIS_CPU_CORES}
nice -n 5 chrt -b 0 cmake --build $TD_BUILD_DIR --target install --parallel ${TRAVIS_CPU_CORES}
# Undo split-sources
cd $TD_SRC_DIR
nice -n 5 php SplitSource.php --undo
nice -n 5 chrt -b 0 php SplitSource.php --undo
# ====== Build TdNatives
cd $TDNATIVES_CPP_BUILD_DIR
nice -n 5 \
nice -n 5 chrt -b 0 \
cmake \
-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
-DJNI_FOUND=True \
@ -57,14 +57,15 @@ nice -n 5 \
-DJAVA_INCLUDE_PATH2=${JAVA_INCLUDE_PATH2} \
\
-DCMAKE_BUILD_TYPE=Release \
-DTD_BIN_DIR=${TD_BIN_DIR} \
-DTD_GENERATED_BINARIES_DIR=${TD_CROSS_BIN_DIR}/td/generate \
-DTD_SRC_DIR=${TD_SRC_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
nice -n 5 cmake --build $TDNATIVES_CPP_BUILD_DIR --target install --parallel ${TRAVIS_CPU_CORES}
nice -n 5 chrt -b 0 cmake --build $TDNATIVES_CPP_BUILD_DIR --target install --parallel ${TRAVIS_CPU_CORES}
# ====== Print results stats
echo "CCACHE statistics:"

10
jenkins/scripts/prepare_cross.sh
View File

@ -3,14 +3,12 @@
cd $TRAVIS_BUILD_DIR
source ./jenkins/scripts/setup_workspace.sh
mkdir -p $TD_SRC_DIR/build-native 2>/dev/null || true
cd $TD_SRC_DIR/build-native
mkdir -p ${TD_BIN_DIR}/bin 2>/dev/null || true
nice -n 5 cmake \
cd $TD_CROSS_BIN_DIR
nice -n 5 chrt -b 0 cmake \
-DTD_ENABLE_JNI=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \
-DCMAKE_INSTALL_BINDIR:PATH=${TD_BIN_DIR}/bin \
$TD_SRC_DIR
nice -n 5 cmake --build . --target prepare_cross_compiling --parallel ${TRAVIS_CPU_CORES}
nice -n 5 cmake --build . --target install --parallel ${TRAVIS_CPU_CORES}
nice -n 5 chrt -b 0 cmake --build . --target prepare_cross_compiling --parallel ${TRAVIS_CPU_CORES}
nice -n 5 chrt -b 0 cmake --build . --target td_generate_java_api --parallel ${TRAVIS_CPU_CORES}

4
jenkins/scripts/setup_variables.sh
View File

@ -7,7 +7,7 @@ export TDNATIVES_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-tdlib
export TDNATIVES_CPP_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/src/tdlib-cpp
export TDNATIVES_DOCS_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-docs
export TD_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-td
export TD_CROSS_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-td-cross
export TD_CROSS_BIN_DIR=$TD_SRC_DIR/bin-td-cross
export TDNATIVES_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-tdlib
export JAVA_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/src/tdlib-java
export TDLIB_SERIALIZER_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlib-serializer
@ -32,7 +32,7 @@ echo "TDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR}"
echo "TDNATIVES_CPP_SRC_DIR=${TDNATIVES_CPP_SRC_DIR}"
echo "TDNATIVES_DOCS_BIN_DIR=${TDNATIVES_DOCS_BIN_DIR}"
echo "TD_BUILD_DIR=${TD_BUILD_DIR}"
echo "TD_CROSS_BUILD_DIR=${TD_CROSS_BUILD_DIR}"
echo "TD_CROSS_BIN_DIR=${TD_CROSS_BIN_DIR}"
echo "TDNATIVES_CPP_BUILD_DIR=${TDNATIVES_CPP_BUILD_DIR}"
echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}"
echo "TDLIB_SERIALIZER_DIR=${TDLIB_SERIALIZER_DIR}"

1
jenkins/scripts/setup_workspace.sh
View File

@ -5,6 +5,7 @@ source ./jenkins/scripts/setup_variables.sh
# ====== Environment setup
[ -d $TD_BUILD_DIR ] || mkdir -p $TD_BUILD_DIR
[ -d $TD_BIN_DIR ] || mkdir -p $TD_BIN_DIR
[ -d $TD_NATIVE_BIN_DIR ] || mkdir -p $TD_NATIVE_BIN_DIR
[ -d $TD_CROSS_BUILD_DIR ] || mkdir -p $TD_CROSS_BUILD_DIR
[ -d $TDNATIVES_CPP_BUILD_DIR ] || mkdir -p $TDNATIVES_CPP_BUILD_DIR

2
tdlight-java

@ -1 +1 @@
Subproject commit 3a28e53e5bd0cd675149731ed617ff8f99773f48
Subproject commit 72d7721ff12f41903d29504b2c23e6491e73c271