From 69e88fd4ec13a588875b905d632e5e24c32aaaa1 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 3 Nov 2022 06:26:31 +0100
Subject: [PATCH] Improve RCP packaging

---
 .../eclipse-rcp/excludes.properties                  | 12 +++++++++++-
 .../eclipse-rcp/includes.properties                  |  8 ++++++--
 .../org.eclipse.emf.common.bnd                       |  3 ---
 .../org.eclipse.emf.ecore.bnd                        |  3 ---
 .../org.eclipse.emf.ecore.change.bnd                 |  3 ---
 .../org.eclipse.emf.ecore.xmi.bnd                    |  3 ---
 .../org.argeo.tp.swt/eclipse-rcp/includes.properties |  6 +++++-
 sdk/output-argeo-tp-rwt.target                       |  2 +-
 sdk/output-argeo-tp-swt.target                       |  3 +--
 9 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd
 delete mode 100644 repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd
 delete mode 100644 repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd
 delete mode 100644 repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd

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 afab46b..df821df 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
@@ -4,8 +4,18 @@ plugins/org.eclipse.osgi.*.jar=
 plugins/org.eclipse.platform.doc.*.jar=
 plugins/org.eclipse.jetty.*.jar=
 plugins/org.eclipse.*.cocoa*.jar=
-plugins/org.eclipse.core.*.jar=
+plugins/org.eclipse.*.win32*.jar=
+plugins/org.eclipse.*.gtk*.jar=
+plugins/org.eclipse.core.commands*.jar=
+plugins/org.eclipse.core.runtime*.jar=
+plugins/org.eclipse.core.jobs*.jar=
+plugins/org.eclipse.core.contenttype*.jar=
 plugins/org.eclipse.jface_*.jar=
 plugins/org.eclipse.jface.source_*.jar=
+plugins/org.eclipse.core.externaltools*.jar
 plugins/*ppc64le*
 plugins/org.eclipse.e4.ui.css*.jar=
+plugins/org.eclipse.core.net*.jar
+plugins/org.eclipse.core.file*.jar
+plugins/org.eclipse.core.resources*.jar
+
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
index 812ea25..2e54d27 100644
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
+++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
@@ -1,6 +1,10 @@
 plugins/javax.inject*.jar=
 plugins/javax.annotation*.jar=
 plugins/org.apache.commons.jxpath*.jar=
-plugins/org.eclipse.*.jar=
+plugins/org.eclipse.text_*.jar=
+plugins/org.eclipse.core*.jar=
+plugins/org.eclipse.e4.*.jar=
+plugins/org.eclipse.emf.*.jar=
+plugins/org.eclipse.jface.*.jar=
+plugins/org.eclipse.urischeme*.jar=
 plugins/com.ibm.icu*.jar=
-
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd
deleted file mode 100644
index 6bade45..0000000
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.common.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: EPEL-2.0
-SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.common:2.24.0
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd
deleted file mode 100644
index 30033bf..0000000
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: EPEL-2.0
-SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore:2.26.0
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd
deleted file mode 100644
index ba733ef..0000000
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.change.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: EPEL-2.0
-SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore.change:2.14.0
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd
deleted file mode 100644
index 4a40881..0000000
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/org.eclipse.emf.ecore.xmi.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: EPEL-2.0
-SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.16.0
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
index 4724c12..cc21aab 100644
--- a/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
+++ b/repackage/swt/rcp/org.argeo.tp.swt/eclipse-rcp/includes.properties
@@ -1,5 +1,9 @@
 plugins/org.eclipse.swt*.jar=
-plugins/org.eclipse.core*.jar=
+plugins/org.eclipse.core.commands_*.jar=
+plugins/org.eclipse.core.runtime_*.jar=
+plugins/org.eclipse.core.jobs_*.jar=
+plugins/org.eclipse.core.contenttype_*.jar=
 plugins/org.eclipse.jface_*.jar=
 plugins/org.eclipse.jface.source_*.jar=
 plugins/org.eclipse.e4.ui.css*.jar=
+
diff --git a/sdk/output-argeo-tp-rwt.target b/sdk/output-argeo-tp-rwt.target
index c64c694..0b4753f 100644
--- a/sdk/output-argeo-tp-rwt.target
+++ b/sdk/output-argeo-tp-rwt.target
@@ -3,6 +3,6 @@
 <target name="argeo-tp-rwt">
 	<locations>
 		<location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
-		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
+		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
 	</locations>
 </target>
\ No newline at end of file
diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target
index 4dcf075..a55aae5 100644
--- a/sdk/output-argeo-tp-swt.target
+++ b/sdk/output-argeo-tp-swt.target
@@ -4,7 +4,6 @@
 	<locations>
 		<location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 		<location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-		<location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
+		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
 	</locations>
 </target>
\ No newline at end of file
-- 
2.30.2