From a479e4550c541196c129c650ba7f1375b58d10c7 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 10 Apr 2024 08:34:21 +0200
Subject: [PATCH] Upgrade JNA and improve its packaging

---
 repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd | 2 +-
 repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd  | 2 +-
 repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd | 2 +-
 repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd  | 2 +-
 repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd         | 3 ++-
 sdk/argeo-build                                             | 2 +-
 sdk/output-argeo-tp-platform.target                         | 1 +
 sdk/output-argeo-tp-rcp.target                              | 1 -
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
index 4379476..454c4b2 100644
--- a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
index 4379476..454c4b2 100644
--- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
index 4379476..454c4b2 100644
--- a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
index 4379476..454c4b2 100644
--- a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.13.0
+Argeo-Origin-M2: :5.14.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
index a36ded7..202f175 100644
--- a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
+++ b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
@@ -1,2 +1,3 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0
+Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.14.0
 SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/sdk/argeo-build b/sdk/argeo-build
index ec9a0b6..3473c4e 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c
+Subproject commit 3473c4ec64851e97b6d0bb29fe41370c13af7b27
diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
index d26be02..65865cd 100644
--- a/sdk/output-argeo-tp-platform.target
+++ b/sdk/output-argeo-tp-platform.target
@@ -13,6 +13,7 @@
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sys" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp.sys" type="Directory"/>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
\ No newline at end of file
diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
index 2f2d6ac..bd35257 100644
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@ -3,7 +3,6 @@
 <target name="argeo-tp-rcp">
 	<locations>
 		<location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
-		<location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp.sys" type="Directory"/>
 		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
 		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>
 	</locations>
-- 
2.30.2