always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: fix java pre release support

Browse Source
This commit is contained in:
Mizux Seiha
2025-12-02 12:38:37 +01:00
committed by Corentin Le Molgat
parent 9845ee219b
commit 1adba4f3e7
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/java.cmake
View File

@@ -86,6 +86,12 @@ message(STATUS "Java project: ${JAVA_PROJECT}")
set(JAVA_PROJECT_DIR ${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT})
message(STATUS "Java project build path: ${JAVA_PROJECT_DIR}")
if(RELEASE)
set(JAVA_RELEASE "")
else()
set(JAVA_RELEASE "-RC1")
endif()
##################
## PROTO FILE ##
##################

12
ortools/java/pom-full.xml.in
View File

@@ -7,7 +7,7 @@
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_PROJECT@</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
@@ -69,35 +69,35 @@
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>ortools-linux-x86-64</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>ortools-darwin-x86-64</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>ortools-win32-x86-64</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>ortools-linux-aarch64</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>ortools-darwin-aarch64</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>

4
ortools/java/pom-local.xml.in
View File

@@ -7,7 +7,7 @@
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_PROJECT@</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
@@ -69,7 +69,7 @@
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_NATIVE_PROJECT@</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>

2
ortools/java/pom-native.xml.in
View File

@@ -7,7 +7,7 @@
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_NATIVE_PROJECT@</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>

4
ortools/java/pom-sample.xml.in
View File

@@ -7,7 +7,7 @@
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_SAMPLE_PROJECT@</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_PROJECT@</artifactId>
<version>[@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@,)</version>
<version>[@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@@JAVA_RELEASE@,)</version>
<type>jar</type>
<scope>compile</scope>
</dependency>

4
ortools/java/pom-test.xml.in
View File

@@ -7,7 +7,7 @@
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_TEST_PROJECT@</artifactId>
<version>@PROJECT_VERSION@</version>
<version>@PROJECT_VERSION@@JAVA_RELEASE@</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
@@ -69,7 +69,7 @@
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>@JAVA_PROJECT@</artifactId>
<version>[@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@,)</version>
<version>[@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@@JAVA_RELEASE@,)</version>
<type>jar</type>
<scope>compile</scope>
</dependency>