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

java: Bump jna-platform 5.5.0 -> 5.8.0 (Fix #2519)

Browse Source
This commit is contained in:
Corentin Le Molgat
2021-04-23 15:52:11 +02:00
committed by Mizux Seiha
parent fe195d44ac
commit d6b3090d3a
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/java.cmake
View File

@@ -42,7 +42,7 @@ set(JAVA_PACKAGE_PATH src/main/java/com/google/ortools)
set(JAVA_TEST_PATH src/test/java/com/google/ortools)
set(JAVA_RESOURCES_PATH src/main/resources)
if(APPLE)
set(NATIVE_IDENTIFIER darwin)
set(NATIVE_IDENTIFIER darwin-x86-64)
elseif(UNIX)
set(NATIVE_IDENTIFIER linux-x86-64)
elseif(WIN32)

2
makefiles/Makefile.java.mk
View File

@@ -72,7 +72,7 @@ else
JAVA_NATIVE_IDENTIFIER=linux-x86-64
else
ifeq ($(OS),Darwin)
JAVA_NATIVE_IDENTIFIER=darwin
JAVA_NATIVE_IDENTIFIER=darwin-x86-64
else
$(error OS unknown !)
endif

6
ortools/java/README.md
View File

@@ -3,7 +3,7 @@
This is the documentation page for the Java wrapper of OR-Tools.
This project aim to explain how you build a Java 1.8 native (for win32-x86-64,
linux-x86-64 and darwin) maven multiple package using [`mvn`](http://maven.apache.org/)
linux-x86-64 and darwin-x86-64) maven multiple package using [`mvn`](http://maven.apache.org/)
and few [POM.xml](http://maven.apache.org/pom.html).
## Table of Content
@@ -51,7 +51,7 @@ runtime on which platform the code is currently running.
### Local Package
The pipeline for `linux-x86-64` should be as follow:
note: The pipeline will be similar for `darwin` and `win32-x86-64` architecture,
note: The pipeline will be similar for `darwin-x86-64` and `win32-x86-64` architecture,
don't hesitate to look at the CI log! ![Local Pipeline](doc/local_pipeline.svg)
![Legend](doc/legend.svg)
@@ -82,7 +82,7 @@ If everything good the package (located in
\-libjniortools.so
...
```
note: `<platform>` could be `linux-x86-64`, `darwin` or `win32-x86-64`.
note: `<platform>` could be `linux-x86-64`, `darwin-x86-64` or `win32-x86-64`.
tips: since maven package are just zip archive you can use `unzip -l <package>.jar`
to study their layout.

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

@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>@JAVA_PACKAGE@</groupId>
<artifactId>ortools-darwin</artifactId>
<artifactId>ortools-darwin-x86-64</artifactId>
<version>@PROJECT_VERSION@</version>
<type>jar</type>
<scope>runtime</scope>
@@ -90,7 +90,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.5.0</version>
<version>5.8.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>

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

@@ -76,7 +76,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.5.0</version>
<version>5.8.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>

2
tools/Makefile.cc.java.dotnet
View File

@@ -442,7 +442,7 @@ else
JAVA_NATIVE_IDENTIFIER=linux-x86-64
else
ifeq ($(OS),Darwin)
JAVA_NATIVE_IDENTIFIER=darwin
JAVA_NATIVE_IDENTIFIER=darwin-x86-64
else
$(error OS unknown !)
endif

2
tools/release/build_delivery_mac.sh
View File

@@ -168,7 +168,7 @@ function build_java() {
#make test_java -l 4 UNIX_PYTHON_VER=3.9
#echo "make test_java: DONE" | tee -a build.log
cp temp_java/ortools-darwin/target/*.jar* export/
cp temp_java/ortools-darwin-x86-64/target/*.jar* export/
cp temp_java/ortools-java/target/*.jar* export/
echo "${ORTOOLS_BRANCH} ${ORTOOLS_SHA1}" > "${ROOT_DIR}/export/java_build"
}