From: Mathieu Baudier Date: Sat, 29 Oct 2022 07:35:08 +0000 (+0200) Subject: Improve RCP packaging X-Git-Tag: v2.3.10~16 X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=7bdeb4962dd363399f74658376950a4f1dd0cb29 Improve RCP packaging --- diff --git a/repackage/Makefile b/repackage/Makefile index 2985e0d..c22399c 100644 --- a/repackage/Makefile +++ b/repackage/Makefile @@ -17,6 +17,7 @@ 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 \ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt \ +lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \ swt/rcp/org.argeo.tp.swt \ swt/rcp/org.argeo.tp.swt.workbench \ org.argeo.tp \ 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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..3f9705c --- /dev/null +++ b/repackage/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.linux_*.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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..3f9705c --- /dev/null +++ b/repackage/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.linux_*.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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties new file mode 100644 index 0000000..09daa56 --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties @@ -0,0 +1,3 @@ +plugins/org.eclipse.ui.cocoa_*.jar= +plugins/org.eclipse.e4.ui.workbench.renderers.swt.cocoa_*.jar= + 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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..dd6fc02 --- /dev/null +++ b/repackage/lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.macosx_*.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 new file mode 100644 index 0000000..9a7ae1d --- /dev/null +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/common.bnd @@ -0,0 +1,2 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true diff --git a/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties new file mode 100644 index 0000000..ae97b60 --- /dev/null +++ b/repackage/lib/win32/x86_64/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -0,0 +1 @@ +plugins/org.eclipse.equinox.security.win32.x86_64_*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties index 7c8efe3..32cc731 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/excludes.properties @@ -1,5 +1,7 @@ plugins/org.eclipse.swt*.jar= plugins/org.eclipse.equinox*.jar= +plugins/org.eclipse.osgi.*.jar= +plugins/org.eclipse.*.cocoa*.jar= plugins/org.eclipse.core.*.jar= plugins/org.eclipse.jface_*.jar= plugins/org.eclipse.jface.source_*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties index f20b07d..4f12642 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-equinox/includes.properties @@ -1 +1 @@ -plugins/org.eclipse.equinox.security*.jar= +plugins/org.eclipse.equinox.security_*.jar= diff --git a/sdk/argeo-build b/sdk/argeo-build index 33fa4ce..87c3236 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 33fa4ce3d184f4d226d1875868434a48741af82c +Subproject commit 87c3236a9b8d7700aa9fb161951adda528e33f72