From: Mathieu Baudier Date: Wed, 29 Mar 2023 07:53:37 +0000 (+0200) Subject: Move JNA to org.argeo.tp and update Eclipse licenses X-Git-Tag: v2.3.12~2 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=189e09096d5663f2d40eee792362a0724b5c0900 Move JNA to org.argeo.tp and update Eclipse licenses --- diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index bc2dfdf..d271eb9 100644 --- a/rebuild/org.argeo.tp.utils/Makefile +++ b/rebuild/org.argeo.tp.utils/Makefile @@ -3,6 +3,8 @@ include ../../sdk.mk export NO_SDK_LEGAL := true +A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(uname -m)/$(A2_CATEGORY) + MBOX_JNI_SRC=jni/com_sun_mail_mbox MBOX_TARGET_EXEC=libmbox.so @@ -27,8 +29,8 @@ retrieve-ee4j-mbox: rm -rf com.sun.mail.mbox/bin jni-ee4j-mbox: - mkdir -p $(A2_OUTPUT)/lib/linux/x86_64/$(A2_CATEGORY) - $(CC) -o $(A2_OUTPUT)/lib/linux/x86_64/$(A2_CATEGORY)/$(MBOX_TARGET_EXEC) \ + mkdir -p $(A2_NATIVE_CATEGORY) + $(CC) -o $(A2_A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \ -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).1.6 \ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c diff --git a/repackage/Makefile b/repackage/Makefile index 843a42c..e846c0b 100644 --- a/repackage/Makefile +++ b/repackage/Makefile @@ -8,6 +8,10 @@ osgi/equinox/org.argeo.tp.eclipse \ swt/rap/org.argeo.tp.swt \ swt/rap/org.argeo.tp.swt.workbench \ swt/rcp/org.argeo.tp.swt \ +lib/linux/x86_64/org.argeo.tp \ +lib/linux/aarch64/org.argeo.tp \ +lib/win32/x86_64/org.argeo.tp \ +lib/macosx/x86_64/org.argeo.tp \ lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \ lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \ lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \ diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd new file mode 100644 index 0000000..8c4c7a4 --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties new file mode 100644 index 0000000..c5cebf3 --- /dev/null +++ b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties @@ -0,0 +1 @@ +plugins/com.sun.jna*.jar= diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties index d39a318..1fbffdc 100644 --- a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties @@ -1,2 +1 @@ -plugins/com.sun.jna*.jar= plugins/org.eclipse.swt.gtk.linux.aarch64*= diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd new file mode 100644 index 0000000..8c4c7a4 --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties new file mode 100644 index 0000000..c5cebf3 --- /dev/null +++ b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties @@ -0,0 +1 @@ +plugins/com.sun.jna*.jar= diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties index 56af205..fbdfacf 100644 --- a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties @@ -1,2 +1 @@ -plugins/com.sun.jna*.jar= plugins/org.eclipse.swt.gtk.linux.x86_64*= diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd new file mode 100644 index 0000000..8c4c7a4 --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties new file mode 100644 index 0000000..c5cebf3 --- /dev/null +++ b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties @@ -0,0 +1 @@ +plugins/com.sun.jna*.jar= diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties index 5405ab8..48e954a 100644 --- a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties @@ -1,2 +1 @@ -plugins/com.sun.jna*.jar= plugins/org.eclipse.swt.cocoa.macosx.x86_64*= diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd new file mode 100644 index 0000000..8c4c7a4 --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties new file mode 100644 index 0000000..c5cebf3 --- /dev/null +++ b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties @@ -0,0 +1 @@ +plugins/com.sun.jna*.jar= diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties index 7dff8c9..24c11dd 100644 --- a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties @@ -1,2 +1 @@ -plugins/com.sun.jna*.jar= plugins/org.eclipse.swt.win32.win32.x86_64*= diff --git a/repackage/org.argeo.tp.sdk/org.junit.bnd b/repackage/org.argeo.tp.sdk/org.junit.bnd index 88261ef..5d6cbfa 100644 --- a/repackage/org.argeo.tp.sdk/org.junit.bnd +++ b/repackage/org.argeo.tp.sdk/org.junit.bnd @@ -1,4 +1,4 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Import-Package: org.hamcrest;resolution:=optional,\ org.hamcrest.core;resolution:=optional,\ * diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd +++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd +++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd +++ b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd +++ b/repackage/swt/rap/org.argeo.tp.swt/eclipse-rap/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd +++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd index 8f5fe73..743e1d3 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd +++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/common.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: EPL-1.0 +SPDX-License-Identifier: EPL-2.0 Argeo-Origin-NoMetadataGeneration: true