Compare commits

..

29 Commits

Author SHA1 Message Date
Andrea Cavalli
1eeea32717 Update tdlight-java 2020-10-09 21:01:16 +02:00
Andrea Cavalli
c7ba1bbf5d Static compilation 2020-10-09 21:01:06 +02:00
Andrea Cavalli
f1e710929f Update cross_compile.sh 2020-10-09 03:29:01 +02:00
Andrea Cavalli
c4c608c511 Update dockerfile and cross_compile.sh 2020-10-09 02:29:53 +02:00
Andrea Cavalli
03a5108d61 Update cross_compile.sh 2020-10-08 20:24:56 +02:00
Andrea Cavalli
972e80d5f5 Add missing libraries 2020-10-08 19:43:09 +02:00
Andrea Cavalli
5b1aa1d2b6 Update pom.xml 2020-10-08 12:32:09 +02:00
Andrea Cavalli
4cbf6c2568 Update cross_compile.sh 2020-10-08 04:34:21 +02:00
Andrea Cavalli
25fe68f999 Update dockerfile and cross_compile.sh 2020-10-08 03:44:19 +02:00
Andrea Cavalli
9940a8e49d Update dockerfile 2020-10-08 02:46:45 +02:00
Andrea Cavalli
bcdfb14502 Fix permissions 2020-10-08 02:25:33 +02:00
Andrea Cavalli
5c02945088 Reduce load 2020-10-08 01:49:46 +02:00
Andrea Cavalli
2f08718bff Update cross_compile.sh 2020-10-08 01:34:54 +02:00
Andrea Cavalli
52d4e3f742 Update dockerfile 2020-10-08 01:29:28 +02:00
Andrea Cavalli
41e5137fa9 Update dockerfile 2020-10-08 01:28:08 +02:00
Andrea Cavalli
85bfa22c1c Update .gitmodules 2020-10-08 01:18:30 +02:00
Andrea Cavalli
0e9bea6c60 Update dockerfile, dockerfile, and 6 more files... 2020-10-08 01:11:46 +02:00
Andrea Cavalli
909ccc1b11 Update Jenkinsfile 2020-10-08 01:06:36 +02:00
Andrea Cavalli
83ad66dea5 Update tdlight-java 2020-10-08 01:05:55 +02:00
Andrea Cavalli
27779e19b2 Update pom.xml 2020-10-03 13:49:50 +02:00
Andrea Cavalli
149cd00bf1 Update .gitmodules, Jenkinsfile, and 4 more files... 2020-10-03 12:03:12 +02:00
Andrea Cavalli
20b64da5d0 Update pom.xml 2020-08-23 13:34:07 +02:00
Andrea Cavalli
4f37097d6b Updated native library 2020-08-20 23:25:40 +02:00
Andrea Cavalli
76c0e29e0d Updated native library 2020-08-20 23:17:21 +02:00
Andrea Cavalli
912d7428b6 Updated native library 2020-08-20 23:16:58 +02:00
Andrea Cavalli
84c65c40e0 Updated native library 2020-08-20 20:25:53 +00:00
Andrea Cavalli
fc07248096 Update pom.xml 2020-08-20 22:22:26 +02:00
Andrea Cavalli
99de50cd92 Updated native library 2020-08-20 19:44:01 +00:00
Andrea Cavalli
5b5cbaac5e Update pom.xml 2020-08-20 16:06:12 +02:00
5 changed files with 9 additions and 18 deletions

5
Jenkinsfile vendored
View File

@ -15,9 +15,6 @@ pipeline {
booleanParam(name: "RELEASE", booleanParam(name: "RELEASE",
description: "Build a release from current commit.", description: "Build a release from current commit.",
defaultValue: false) defaultValue: false)
booleanParam(name: "DEBUGINFO",
description: "Build debug binary from current commit.",
defaultValue: false)
} }
stages { stages {
stage("Setup workspace") { stage("Setup workspace") {
@ -60,7 +57,7 @@ pipeline {
} }
} }
steps { steps {
sh "DEBUGINFO=${params.DEBUGINFO} ./jenkins/scripts/cross_compile.sh" sh "./jenkins/scripts/cross_compile.sh"
} }
} }

View File

@ -30,7 +30,7 @@ nice -n 5 chrt -b 0 \
-DZLIB_LIBRARY=/home/jenkins/zlib_cross/lib/libz.a \ -DZLIB_LIBRARY=/home/jenkins/zlib_cross/lib/libz.a \
-DZLIB_INCLUDE_DIR=/home/jenkins/zlib_cross/include \ -DZLIB_INCLUDE_DIR=/home/jenkins/zlib_cross/include \
\ \
-DCMAKE_BUILD_TYPE=$BUILDPROFILE \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \ -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \
-DTD_ENABLE_JNI=ON \ -DTD_ENABLE_JNI=ON \
${TD_SRC_DIR} ${TD_SRC_DIR}

View File

@ -1,14 +1,14 @@
#!/bin/bash -e #!/bin/bash -e
# ====== Variables # ====== Variables
export TD_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlight export TD_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlib
export TD_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-td export TD_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-td
export TDNATIVES_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-tdlight 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_CPP_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/src/tdlib-cpp
export TDNATIVES_DOCS_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-docs 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_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-td
export TD_CROSS_BIN_DIR=$TD_SRC_DIR/bin-td-cross export TD_CROSS_BIN_DIR=$TD_SRC_DIR/bin-td-cross
export TDNATIVES_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-tdlight 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 JAVA_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/src/tdlib-java
export TDLIB_SERIALIZER_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlib-serializer export TDLIB_SERIALIZER_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlib-serializer
export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED"
@ -19,11 +19,6 @@ export TRAVIS_OS_NAME_STANDARD
export TRAVIS_OS_NAME_SHORT="win" export TRAVIS_OS_NAME_SHORT="win"
export SRC_TDJNI_LIBNAME="libtdjni.dll" export SRC_TDJNI_LIBNAME="libtdjni.dll"
export DEST_TDJNI_LIBNAME="tdjni.dll" export DEST_TDJNI_LIBNAME="tdjni.dll"
if [[ "$DEBUGINFO" == "true" ]]; then
export BUILDPROFILE="Debug"
else
export BUILDPROFILE="Release"
fi
# ====== OS Variables # ====== OS Variables
TRAVIS_CPU_ARCH_JAVA="$(tr '[:upper:]' '[:lower:]'<<<"${TRAVIS_CPU_ARCH}")" TRAVIS_CPU_ARCH_JAVA="$(tr '[:upper:]' '[:lower:]'<<<"${TRAVIS_CPU_ARCH}")"
@ -57,7 +52,6 @@ echo "TRAVIS_OS_NAME_SHORT=${TRAVIS_OS_NAME_SHORT}"
echo "SRC_TDJNI_LIBNAME=${SRC_TDJNI_LIBNAME}" echo "SRC_TDJNI_LIBNAME=${SRC_TDJNI_LIBNAME}"
echo "DEST_TDJNI_LIBNAME=${DEST_TDJNI_LIBNAME}" echo "DEST_TDJNI_LIBNAME=${DEST_TDJNI_LIBNAME}"
echo "TDLIB_RESOURCES_OUTPUT_DIR=${TDLIB_RESOURCES_OUTPUT_DIR}" echo "TDLIB_RESOURCES_OUTPUT_DIR=${TDLIB_RESOURCES_OUTPUT_DIR}"
echo "BUILDPROFILE=${BUILDPROFILE}"
echo "CURRENT DIRECTORY* ($(pwd)):" echo "CURRENT DIRECTORY* ($(pwd)):"
ls -alch "$(pwd)" ls -alch "$(pwd)"
echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR}):" echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR}):"

View File

@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-windows-amd64</artifactId> <artifactId>tdlib-natives-windows-amd64</artifactId>
<version>2.0.2-SNAPSHOT</version> <version>2.0.2-SNAPSHOT</version>
<name>TDLight Natives for Windows (amd64)</name> <name>TDLib Natives for Windows (amd64)</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -25,7 +25,7 @@
<connection>scm:git:git@ssh.git.ignuranza.net:tdlight-team/tdlight-java-natives-windows-amd64.git</connection> <connection>scm:git:git@ssh.git.ignuranza.net:tdlight-team/tdlight-java-natives-windows-amd64.git</connection>
<url>scm:git:git@github.com:user/project.git</url> <url>scm:git:git@github.com:user/project.git</url>
<developerConnection>scm:git:git@ssh.git.ignuranza.net:tdlight-team/tdlight-java-natives-windows-amd64.git</developerConnection> <developerConnection>scm:git:git@ssh.git.ignuranza.net:tdlight-team/tdlight-java-natives-windows-amd64.git</developerConnection>
<tag>master</tag> <tag>td-master</tag>
</scm> </scm>
<build> <build>
<plugins> <plugins>

@ -1 +1 @@
Subproject commit 6f1cd83927abfc69d0249542b2725f521dbf1189 Subproject commit 20423357ac5c2487998ca1634c97def0bda80a75