Update tdlight-java

Conflicts:
	Jenkinsfile

Jenkinsfile

@@ -15,6 +15,9 @@ pipeline {
 		booleanParam(name: "RELEASE",
 			description: "Build a release from current commit.",
 			defaultValue: false)
+		booleanParam(name: "DEBUGINFO",
+			description: "Build debug binary from current commit.",
+			defaultValue: false)
 	}
 	stages {
 		stage("Setup workspace") {
@@ -57,7 +60,7 @@ pipeline {
 				}
 			}
 			steps {
-				sh "./jenkins/scripts/cross_compile.sh"
+				sh "DEBUGINFO=${params.DEBUGINFO} ./jenkins/scripts/cross_compile.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_INCLUDE_DIR=/home/jenkins/zlib_cross/include \
  \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=$BUILDPROFILE \
  -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} \
  -DTD_ENABLE_JNI=ON \
  ${TD_SRC_DIR}

jenkins/scripts/setup_variables.sh

@@ -1,14 +1,14 @@
 #!/bin/bash -e
 
 # ====== Variables
-export TD_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlib
+export TD_SRC_DIR=$TRAVIS_BUILD_DIR/tdlight-java/dependencies/tdlight
 export TD_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-td
-export TDNATIVES_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-tdlib
+export TDNATIVES_BIN_DIR=$TRAVIS_BUILD_DIR/tdlight-java/bin-tdlight
 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_BIN_DIR=$TD_SRC_DIR/bin-td-cross
-export TDNATIVES_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-tdlib
+export TDNATIVES_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/tdlight-java/build-tdlight
 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 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,6 +19,11 @@ export TRAVIS_OS_NAME_STANDARD
 	export TRAVIS_OS_NAME_SHORT="win"
 export SRC_TDJNI_LIBNAME="libtdjni.dll"
 export DEST_TDJNI_LIBNAME="tdjni.dll"
+if [[ "$DEBUGINFO" == "true" ]]; then
+	export BUILDPROFILE="Debug"
+else
+	export BUILDPROFILE="Release"
+fi
 
 # ====== OS Variables
 TRAVIS_CPU_ARCH_JAVA="$(tr '[:upper:]' '[:lower:]'<<<"${TRAVIS_CPU_ARCH}")"
@@ -52,6 +57,7 @@ echo "TRAVIS_OS_NAME_SHORT=${TRAVIS_OS_NAME_SHORT}"
 echo "SRC_TDJNI_LIBNAME=${SRC_TDJNI_LIBNAME}"
 echo "DEST_TDJNI_LIBNAME=${DEST_TDJNI_LIBNAME}"
 echo "TDLIB_RESOURCES_OUTPUT_DIR=${TDLIB_RESOURCES_OUTPUT_DIR}"
+echo "BUILDPROFILE=${BUILDPROFILE}"
 echo "CURRENT DIRECTORY* ($(pwd)):"
 ls -alch "$(pwd)"
 echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR}):"

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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>it.tdlight</groupId>
-	<artifactId>tdlib-natives-windows-amd64</artifactId>
+	<artifactId>tdlight-natives-windows-amd64</artifactId>
 	<version>2.0.2-SNAPSHOT</version>
-	<name>TDLib Natives for Windows (amd64)</name>
+	<name>TDLight Natives for Windows (amd64)</name>
 	<packaging>jar</packaging>
 	<properties>
 		<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>
 		<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>
-		<tag>td-master</tag>
+		<tag>master</tag>
 	</scm>
 	<build>
 		<plugins>

tdlight-java

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