Update Jenkinsfile, dockerfile, and 8 more files...

2020-10-06 17:44:53 +02:00 · 2020-10-06 17:44:53 +02:00 · 5f0088b6b7
commit 5f0088b6b7
parent 0a69058a9b
8 changed files with 130 additions and 38 deletions
--- a/24
+++ b/24
@ -27,16 +27,17 @@ pipeline {
 				sh "chown 1000:1000 -R \"/var/jenkins_cache/.m2\""
 				sh "mkdir -p \"/var/jenkins_cache/.ccache\""
 				sh "chown 1000:1000 -R \"/var/jenkins_cache/.ccache\""
+				sh "mkdir -p \"/var/jenkins_cache/.ccache_arm64\""
+				sh "chown 1000:1000 -R \"/var/jenkins_cache/.ccache_arm64\""
 				sh "mkdir -p \"${workspace}/tdlight-java/src/main\""
 				sh "chown 1000:1000 -R \"${workspace}\""
 				sh "chmod 771 -R \"${workspace}\""
 			}
 		}
-	
-		stage("Compile C++") {
+		stage("Prepare native C++") {
 			agent {
 				dockerfile {
-					dir 'jenkins/docker'
+					dir 'jenkins/docker/native'
 					filename 'dockerfile'
 					additionalBuildArgs '--build-arg version=1.0.0 --build-arg UID=1000 --build-arg GID=1000 --build-arg UNAME=jenkins'
 					args "-v \"${workspace}/src/main:/home/jenkins/output:rw\" -v \"/var/jenkins_cache/.m2:/home/jenkins/.m2:rw\" -v \"/var/jenkins_cache/.ccache:/home/jenkins/.ccache:rw\" -v \"${workspace}:/home/jenkins/work:rw\""
@ -44,7 +45,22 @@ pipeline {
 				}
 			}
 			steps {
-				sh "./jenkins/scripts/compile.sh"
+				sh "./jenkins/scripts/prepare_cross.sh"
+			}
+		}
+	
+		stage("Cross compile C++") {
+			agent {
+				dockerfile {
+					dir 'jenkins/docker/arm64'
+					filename 'dockerfile'
+					additionalBuildArgs '--build-arg version=1.0.0 --build-arg UID=1000 --build-arg GID=1000 --build-arg UNAME=jenkins'
+					args "-v \"${workspace}/src/main:/home/jenkins/output:rw\" -v \"/var/jenkins_cache/.m2:/home/jenkins/.m2:rw\" -v \"/var/jenkins_cache/.ccache_arm64:/home/jenkins/.ccache:rw\" -v \"${workspace}:/home/jenkins/work:rw\""
+					reuseNode false
+				}
+			}
+			steps {
+				sh "./jenkins/scripts/cross_compile.sh"
 			}
 		}

--- a/jenkins/docker/arm64/dockerfile
+++ b/jenkins/docker/arm64/dockerfile
--- a/jenkins/docker/native/dockerfile
+++ b/jenkins/docker/native/dockerfile
@ -0,0 +1,58 @@
+FROM debian:stable-slim
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get upgrade -y
+
+RUN apt-get install wget -y
+
+RUN wget https://cdn.azul.com/zulu/bin/zulu11.41.23-ca-jdk11.0.8-linux_amd64.deb -O /tmp/install.deb 2>/dev/null
+RUN mkdir -p /usr/share/man/man1
+RUN apt-get install /tmp/install.deb -y
+
+RUN apt-get install sudo -y
+
+RUN apt-get install maven -y
+
+RUN apt-get install gcc gperf make cmake ccache -y
+
+#RUN apt-get install clang libc++-dev libc++abi-dev -y
+
+RUN apt-get install libssl-dev:amd64 zlib1g-dev:amd64 -y
+
+RUN apt-get install build-essential -y
+
+RUN apt-get install php-fpm php-cli -y
+
+RUN apt-get install libreadline-dev git -y
+
+ARG UNAME=debian
+ARG UID=1000
+ARG GID=1000
+RUN groupadd -g $GID -o $UNAME
+RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
+RUN usermod -a -G sudo $UNAME
+RUN echo "$UNAME ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+USER $UNAME
+
+RUN mkdir /home/$UNAME/work
+
+RUN mkdir /home/$UNAME/output
+
+WORKDIR /home/$UNAME/work
+
+ENV CCACHE_DIR=/home/$UNAME/.ccache
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-amd64
+ENV JAVA_INCLUDE_PATH=/usr/lib/jvm/zulu-11-amd64/include
+ENV JAVA_INCLUDE_PATH2=/usr/lib/jvm/zulu-11-amd64/include/linux
+ENV JAVA_AWT_INCLUDE_PATH=/usr/lib/jvm/zulu-11-amd64/include
+ENV JAVA_AWT_LIBRARY=/usr/lib/jvm/zulu-11-amd64/lib
+ENV JAVA_JVM_LIBRARY=/usr/lib/jvm/zulu-11-amd64/lib
+
+ENV TRAVIS_CPU_ARCH=amd64
+ENV TRAVIS_OS_NAME=linux
+ENV TRAVIS_BUILD_DIR=/home/$UNAME/work
+ENV TRAVIS_OUTPUT_DIR=/home/$UNAME/output
+
+CMD ["bash"] 
--- a/jenkins/scripts/cross_compile.sh
+++ b/jenkins/scripts/cross_compile.sh
@ -1,12 +1,10 @@
 #!/bin/bash -e
-# ====== Setup environment variables
-cd $TRAVIS_BUILD_DIR
-source ./jenkins/scripts/setup_variables.sh
-
 # ====== Setup workspace
 cd $TRAVIS_BUILD_DIR
-bash -e ./jenkins/scripts/setup_workspace.sh
+source ./jenkins/scripts/setup_workspace.sh

+#export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-arm64
+export JAVA_HOME=/usr/lib/jvm/zulu-11-amd64
 export JAVA_INCLUDE_PATH=/usr/lib/jvm/java-11-openjdk-arm64/include
 export JAVA_INCLUDE_PATH2=/usr/lib/jvm/java-11-openjdk-arm64/include/linux
 export JAVA_AWT_INCLUDE_PATH=/usr/lib/jvm/java-11-openjdk-arm64/include
@ -15,34 +13,31 @@ export JAVA_JVM_LIBRARY=/usr/lib/jvm/java-11-openjdk-arm64/lib/server/libjvm.so

 TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/toolchain-arm64.cmake

-# ====== Cross compile preparation
-cd $TD_SRC_DIR
-rm -r build_native 2>/dev/null || true
-mkdir build_native
-cd build_native
-nice -n 5 \
-	cmake -DCMAKE_BUILD_TYPE=Release ..
-cmake --build . --target prepare_cross_compiling
-cd ..
-
-
 # ====== Prepare TdLib
 # Cross compilation preparation (also needed for split sources)
 cd $TD_BUILD_DIR
 nice -n 5 \
-  cmake \
-  -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
-  \
-  -DCMAKE_BUILD_TYPE=Release ${TD_SRC_DIR} \
-  -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \
-  -DTD_ENABLE_JNI=ON \
-  $TD_SRC_DIR
+ cmake \
+ -DCMAKE_CROSSCOMPILING=ON \
+ -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
+ -DJNI_FOUND=True \
+ -DJNI_LIBRARIES="${JAVA_AWT_LIBRARY} ${JAVA_JVM_LIBRARY}" \
+ -DJNI_INCLUDE_DIRS="${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH}" \
+ -DJAVA_JVM_LIBRARY=${JAVA_JVM_LIBRARY} \
+ -DJAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH} \
+ -DJAVA_INCLUDE_PATH2=${JAVA_INCLUDE_PATH2} \
+ \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \
+ -DTD_ENABLE_JNI=ON \
+ ${TD_SRC_DIR}

 # Split sources
 cd $TD_SRC_DIR
 nice -n 5 php SplitSource.php

 # Build
+cd $TD_BUILD_DIR
 nice -n 5 cmake --build $TD_BUILD_DIR --target install --parallel ${TRAVIS_CPU_CORES}

 # Undo split-sources
@ -54,13 +49,19 @@ cd $TDNATIVES_CPP_BUILD_DIR
 nice -n 5 \
 cmake \
 -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
+ -DJNI_FOUND=True \
+ -DJNI_LIBRARIES="${JAVA_AWT_LIBRARY} ${JAVA_JVM_LIBRARY}" \
+ -DJNI_INCLUDE_DIRS="${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH}" \
+ -DJAVA_JVM_LIBRARY=${JAVA_JVM_LIBRARY} \
+ -DJAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH} \
+ -DJAVA_INCLUDE_PATH2=${JAVA_INCLUDE_PATH2} \
 \
 -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \
 -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} \
+ -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}
--- a/jenkins/scripts/prepare_cross.sh
+++ b/jenkins/scripts/prepare_cross.sh
@ -0,0 +1,16 @@
+#!/bin/bash -e
+# ====== Setup workspace
+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 \
+ -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}
--- a/jenkins/scripts/setup_variables.sh
+++ b/jenkins/scripts/setup_variables.sh
@ -2,12 +2,12 @@

 # ====== Variables
 export TD_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlib
-export TD_BIN_DIR=$TRAVIS_BUILD_DIR/bin-td
-export TDNATIVES_BIN_DIR=$TRAVIS_BUILD_DIR/bin-tdlib
+export TD_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-td
+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/bin-docs
-export TD_BUILD_DIR=$TRAVIS_BUILD_DIR/build-td
-export TD_CROSS_BUILD_DIR=$TRAVIS_BUILD_DIR/build-td-cross
+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 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
--- a/jenkins/scripts/setup_workspace.sh
+++ b/jenkins/scripts/setup_workspace.sh
@ -3,9 +3,10 @@
 source ./jenkins/scripts/setup_variables.sh

 # ====== Environment setup
-[ -d $TD_BUILD_DIR ] || mkdir $TD_BUILD_DIR
-[ -d $TD_CROSS_BUILD_DIR ] || mkdir $TD_CROSS_BUILD_DIR
-[ -d $TDNATIVES_CPP_BUILD_DIR ] || mkdir $TDNATIVES_CPP_BUILD_DIR
+[ -d $TD_BUILD_DIR ] || mkdir -p $TD_BUILD_DIR
+[ -d $TD_BIN_DIR ] || mkdir -p $TD_BIN_DIR
+[ -d $TD_CROSS_BUILD_DIR ] || mkdir -p $TD_CROSS_BUILD_DIR
+[ -d $TDNATIVES_CPP_BUILD_DIR ] || mkdir -p $TDNATIVES_CPP_BUILD_DIR

 echo "CCACHE statistics:"
 ccache -s
--- a/toolchain-arm64.cmake
+++ b/toolchain-arm64.cmake
@ -1,4 +1,4 @@
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_C_COMPILER   /usr/bin/aarch64-linux-gnu-gcc)
 SET(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++)
-SET(CMAKE_LINKER aarch64-linux-gnu-ld)
+SET(CMAKE_LINKER /usr/bin/aarch64-linux-gnu-ld)