Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
1eeea32717 | ||
|
c7ba1bbf5d | ||
|
f1e710929f | ||
|
c4c608c511 | ||
|
03a5108d61 | ||
|
972e80d5f5 | ||
|
5b1aa1d2b6 | ||
|
4cbf6c2568 | ||
|
25fe68f999 | ||
|
9940a8e49d | ||
|
bcdfb14502 | ||
|
5c02945088 | ||
|
2f08718bff | ||
|
52d4e3f742 | ||
|
41e5137fa9 | ||
|
85bfa22c1c | ||
|
0e9bea6c60 | ||
|
909ccc1b11 | ||
|
83ad66dea5 | ||
|
27779e19b2 | ||
|
149cd00bf1 | ||
|
20b64da5d0 | ||
|
4f37097d6b | ||
|
76c0e29e0d | ||
|
912d7428b6 | ||
|
84c65c40e0 | ||
|
fc07248096 | ||
|
99de50cd92 | ||
|
5b5cbaac5e |
5
Jenkinsfile
vendored
5
Jenkinsfile
vendored
@ -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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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}
|
||||||
|
@ -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}):"
|
||||||
|
6
pom.xml
6
pom.xml
@ -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
|
Loading…
Reference in New Issue
Block a user