From e5c9c318b8b56ef2c42be4087a8b0ce7307133d6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Mar 2024 16:22:50 +0100 Subject: [PATCH] Improve JNA and Equinox packaging --- .../aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd | 2 -- .../x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd | 2 -- .../x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd | 2 -- .../x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd | 2 -- repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd | 2 ++ .../org.argeo.tp.eclipse/eclipse-equinox/includes.properties | 1 - .../org.argeo.tp.osgi/eclipse-equinox/includes.properties | 1 + repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd | 5 +++++ sdk/argeo-build | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd delete mode 100644 repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd delete mode 100644 repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd delete mode 100644 repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd create mode 100644 repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd create mode 100644 repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd deleted file mode 100644 index 11a8eb3..0000000 --- a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: net.java.dev.jna:jna-platform -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd deleted file mode 100644 index 11a8eb3..0000000 --- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: net.java.dev.jna:jna-platform -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd deleted file mode 100644 index 11a8eb3..0000000 --- a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: net.java.dev.jna:jna-platform -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd deleted file mode 100644 index 11a8eb3..0000000 --- a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd +++ /dev/null @@ -1,2 +0,0 @@ -Argeo-Origin-M2: net.java.dev.jna:jna-platform -Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd new file mode 100644 index 0000000..a36ded7 --- /dev/null +++ b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd @@ -0,0 +1,2 @@ +Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0 +SPDX-License-Identifier: Apache-2.0 diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties index ac8b8b7..4aaa947 100644 --- a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties +++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties @@ -1,6 +1,5 @@ plugins/org.eclipse.equinox.app*.jar= plugins/org.eclipse.equinox.cm*.jar= -plugins/org.eclipse.equinox.common*.jar= plugins/org.eclipse.equinox.ds*.jar= plugins/org.eclipse.equinox.metatype*.jar= plugins/org.eclipse.equinox.event*.jar= diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties index e96922c..3ce71c6 100644 --- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties +++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties @@ -8,3 +8,4 @@ plugins/org.apache.felix.gogo.*.jar= plugins/org.apache.felix.scr*.jar= plugins/org.eclipse.equinox.console_*.jar= plugins/org.eclipse.equinox.console.source_*.jar= +plugins/org.eclipse.equinox.common*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd new file mode 100644 index 0000000..ac2786b --- /dev/null +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd @@ -0,0 +1,5 @@ +# Fake JNA bundle +# FIXME make it smaller +Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0 +SPDX-License-Identifier: Apache-2.0 +Export-Package: diff --git a/sdk/argeo-build b/sdk/argeo-build index 6f8e29e..e021d17 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 6f8e29e850f9fcfa5149e296e650355fab930752 +Subproject commit e021d17c09f8586a68177e9eb40d9caa088c37b1 -- 2.30.2