Equinox OSGi framework in a separate category

diff --git a/rebuild/org.argeo.tp.sys/Makefile b/rebuild/org.argeo.tp.sys/Makefile
index 12499c48f193c679ccdfdc2d569772de8df0e553..ccebea840de5ffad1b486a42d19978d7085ea256 100644 (file)
--- a/rebuild/org.argeo.tp.sys/Makefile
+++ b/rebuild/org.argeo.tp.sys/Makefile
@@ -13,11 +13,13 @@ ANGUS_BRANCH=2.0
 ANGUS_VERSION=$(ANGUS_BRANCH).3
 
 all: retrieve-angus-mbox osgi jni-angus-mbox
+       mkdir -p $(SDK_BUILD_BASE)/a2/$(TARGET_ARCH_CATEGORY_PREFIX)/$(A2_CATEGORY)
+       mv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar $(SDK_BUILD_BASE)/a2/$(TARGET_ARCH_CATEGORY_PREFIX)/$(A2_CATEGORY)
 
 install:
        mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
        # Angus mbox
-       $(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar
+       $(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(SDK_BUILD_BASE)/a2/$(TARGET_ARCH_CATEGORY_PREFIX)/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar
        #$(INSTALL) $(A2_NATIVE_INSTALL_TARGET) $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC)
        
 uninstall: osgi-uninstall

diff --git a/repackage/Makefile b/repackage/Makefile
index 37eb377944b79506879afe5744944eda62403b64..b9c6bfe458db9ccf38d6f0703f909b359ee69bea 100644 (file)
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -6,6 +6,7 @@ org.argeo.tp \
 org.argeo.tp.httpd \
 crypto/fips/org.argeo.tp.crypto \
 org.argeo.tp.sshd \
+osgi/equinox/org.argeo.tp.osgi.framework \
 osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 

diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/common.bnd
new file mode 100644 (file)
index 0000000..2c682bb
--- /dev/null
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/common.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
+Argeo-Origin-KeepModuleInfo: true

diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/includes.properties
new file mode 100644 (file)
index 0000000..1f77045
--- /dev/null
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/includes.properties
@@ -0,0 +1,2 @@
+plugins/org.eclipse.osgi_*.jar=
+plugins/org.eclipse.osgi.source_*.jar=

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 555e3867948af8e53acbf4578554169390bd1053..743e1d35b9bf18163748d8a0207963a83cab1ac4 100644 (file)
--- 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,3 +1,2 @@
 SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true
-#Argeo-Origin-KeepModuleInfo: true

diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
index 3ce71c63d3abbda01486b76bb073ff00efef682d..38f9c23847de02083c5e3159a6ee82e8a268b1cd 100644 (file)
--- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
@@ -1,5 +1,3 @@
-plugins/org.eclipse.osgi_*.jar=
-plugins/org.eclipse.osgi.source_*.jar=
 plugins/org.eclipse.osgi.util*.jar=
 plugins/org.eclipse.osgi.services*.jar=
 plugins/org.osgi.service.*.jar=

diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
index 65865cd7275641321acbb5f340dc685d60e916cd..ee8fedb6301c197de08dbbfbe594589adbd5d3da 100644 (file)
--- a/sdk/output-argeo-tp-platform.target
+++ b/sdk/output-argeo-tp-platform.target
@@ -5,6 +5,7 @@
                <location path="${project_loc:argeo-tp}/../output/a2/crypto/fips/org.argeo.tp.crypto" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/log/syslogger/org.argeo.tp" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi.framework" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.httpd" type="Directory"/>