From 0cecfaf26b96285f9a545a2c7e19b094754aeea1 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 4 Feb 2022 09:37:58 +0100 Subject: [PATCH] Move third-party specifications to SLC. --- .../src/org/argeo/slc/build/A2Factory.java | 6 ++--- .../eclipse-equinox/common.bnd | 3 +++ .../eclipse-equinox/includes.properties | 26 +++++++++++++++++++ .../eclipse-rap/common.bnd | 3 +++ .../eclipse-rap/includes.properties | 23 ++++++++++++++++ .../eclipse-rcp/common.bnd | 3 +++ .../eclipse-rcp/includes.properties | 1 + 7 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd create mode 100644 tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties create mode 100644 tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd create mode 100644 tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties create mode 100644 tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd create mode 100644 tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java index d53c5660f..d8a80d0b2 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java +++ b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java @@ -281,11 +281,11 @@ public class A2Factory { } public static void main(String[] args) { - Path originBase = Paths.get("../output/origin"); - Path factoryBase = Paths.get("../output/a2"); + Path originBase = Paths.get("../output/origin").toAbsolutePath(); + Path factoryBase = Paths.get("../output/a2").toAbsolutePath(); A2Factory factory = new A2Factory(originBase, factoryBase); - Path descriptorsBase = Paths.get(System.getProperty("user.home"), "/dev/git/unstable/argeo-tp/migration"); + Path descriptorsBase = Paths.get("../tp").toAbsolutePath(); factory.processEclipseArchive( descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox")); diff --git a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd new file mode 100644 index 000000000..1c21a1c40 --- /dev/null +++ b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd @@ -0,0 +1,3 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true +SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.13-201909161045/equinox-SDK-4.13.zip diff --git a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties new file mode 100644 index 000000000..5fa176e12 --- /dev/null +++ b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties @@ -0,0 +1,26 @@ +plugins/org.eclipse.osgi_*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.osgi.source_*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.osgi.util*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.osgi.services*.jar=org.argeo.tp.eclipse.equinox +plugins/javax.servlet*.jar=org.argeo.tp.javax +plugins/javax.el*.jar=org.argeo.tp.javax +plugins/org.apache.felix.gogo.*.jar=org.argeo.tp.apache.felix +plugins/org.apache.felix.scr*.jar=org.argeo.tp.apache.felix +plugins/org.apache.jasper.*.jar=org.argeo.tp.apache +plugins/org.eclipse.equinox.app*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.cm*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.common*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.console_*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.console.source_*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.ds*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.metatype*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.event*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.http.jetty*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.http.registry*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.http.servlet*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.http.servletbridge*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.preferences*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.registry*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.servletbridge*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.util*.jar=org.argeo.tp.eclipse.equinox +plugins/org.eclipse.equinox.jsp.*.jar=org.argeo.tp.eclipse.equinox diff --git a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd new file mode 100644 index 000000000..1fec907d9 --- /dev/null +++ b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd @@ -0,0 +1,3 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true +SLC-Origin-URI: http://www.eclipse.org/downloads/rt/rap/3.10/e4/rap-e4-3.10.0-R-20190911-1524.zip diff --git a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties new file mode 100644 index 000000000..1bfa0a60e --- /dev/null +++ b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/includes.properties @@ -0,0 +1,23 @@ +plugins/javax.inject*.jar=org.argeo.tp.javax +plugins/javax.annotation*.jar=org.argeo.tp.javax +plugins/org.apache.commons.jxpath*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.core.*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.rwt_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.rwt.source_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.rwt.osgi_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.rwt.osgi.source_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.fileupload*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.filedialog*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.e4*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.emf*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.e4_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.e4.source_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.ui.workbench*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.ui_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.ui.source_*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.ui.views*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.jface*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.ui.forms*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.help*.jar=org.argeo.tp.eclipse.rap +plugins/org.eclipse.rap.nebula.*.jar=org.argeo.tp.eclipse.rap +plugins/com.ibm.icu*.jar=org.argeo.tp.eclipse.rap diff --git a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd new file mode 100644 index 000000000..4d63302d0 --- /dev/null +++ b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd @@ -0,0 +1,3 @@ +Bundle-License: EPL-1.0 +SLC-Origin-ManifestNotModified: true +SLC-Origin-URI: http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.13-201909161045/org.eclipse.rcp.source-4.13.zip diff --git a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties new file mode 100644 index 000000000..2ddb58019 --- /dev/null +++ b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/includes.properties @@ -0,0 +1 @@ +plugins/*.jar=org.argeo.tp.eclipse.rcp -- 2.39.2