Improve RCP packaging

diff --git a/repackage/Makefile b/repackage/Makefile
index 2985e0d1543823373d6fe2518bfa3815231fbef5..c22399c0a1f9a53a6746a799fa2ad677ee91587d 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 7c8efe38e5cab6c72186a87c8b265593a5994f87..32cc7315f5f10ea746d9c7c80fe4c9a900d4422f 100644 (file)
--- 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 f20b07d101b76d707a66cfd83f631cc05340b097..4f1264218bad399d0a351a3b1fc1c29f0edc5298 100644 (file)
--- 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 33fa4ce3d184f4d226d1875868434a48741af82c..87c3236a9b8d7700aa9fb161951adda528e33f72 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 33fa4ce3d184f4d226d1875868434a48741af82c
+Subproject commit 87c3236a9b8d7700aa9fb161951adda528e33f72