Rename rebuild category

diff --git a/rebuild/Makefile b/rebuild/Makefile
index 792dfdac8af3679878a894586ab26f3b7498da04..243c3e0a1cf85641d2c620e62ab3e5c753535da7 100644 (file)
--- a/rebuild/Makefile
+++ b/rebuild/Makefile
@@ -1,14 +1,13 @@
 .PHONY: clean all
 
 all:
-       make -C org.argeo.tp.utils all
-
+       make -C org.argeo.tp.sys
 install:
-       make -C org.argeo.tp.utils install
+       make -C org.argeo.tp.sys install
        
 uninstall:
-       make -C org.argeo.tp.utils uninstall
+       make -C org.argeo.tp.sys uninstall
        
 clean:
-       make -C org.argeo.tp.utils clean
+       make -C org.argeo.tp.sys clean
        
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.sys/Makefile b/rebuild/org.argeo.tp.sys/Makefile
new file mode 100644 (file)
index 0000000..ad9857c
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/Makefile
@@ -0,0 +1,63 @@
+include ../../sdk.mk
+.PHONY: clean all osgi
+
+export NO_SDK_LEGAL := true
+
+A2_CATEGORY = org.argeo.tp.sys
+
+MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
+MBOX_TARGET_EXEC=libmbox.so
+
+## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
+ANGUS_BRANCH=2.0
+ANGUS_VERSION=$(ANGUS_BRANCH).2
+
+all: retrieve-angus-mbox osgi jni-angus-mbox
+
+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_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC)
+       
+uninstall: osgi-uninstall
+       $(RM) $(A2_NATIVE_INSTALL_TARGET)/$(MBOX_TARGET_EXEC)
+       @if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
+
+retrieve-angus-mbox: SRC_DIR=src/angus-mail
+retrieve-angus-mbox:
+       rm -rf $(SRC_DIR)
+       mkdir -p $(SRC_DIR)
+#git -C $(SRC_DIR) init
+#git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git
+#git -C $(SRC_DIR) config core.sparseCheckout true
+#echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
+#git -C $(SRC_DIR) pull origin 1.6.7
+       git clone --branch $(ANGUS_VERSION) https://github.com/eclipse-ee4j/angus-mail.git $(SRC_DIR)
+       rm -rf $(SRC_DIR)/.git
+       rsync -a --delete --exclude module-info.java $(SRC_DIR)/providers/mbox/src/main/java/ org.eclipse.angus.mail.mbox/src
+       # jni
+       rsync -a $(SRC_DIR)/providers/mbox/src/main/cpp/org/eclipse/angus/mail/mbox/ $(MBOX_JNI_SRC)
+       mkdir -p org.eclipse.angus.mail.mbox/bin
+       javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
+       rm -rf org.eclipse.angus.mail.mbox/bin
+
+
+BUNDLES = \
+org.eclipse.angus.mail.mbox \
+
+clean:
+       rm -rf $(BUILD_BASE)
+
+DEP_CATEGORIES = org.argeo.tp.sys
+
+include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
+
+A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
+
+jni-angus-mbox:
+       mkdir -p $(A2_NATIVE_CATEGORY)
+       $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
+        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).$(ANGUS_BRANCH) \
+        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
+

diff --git a/rebuild/org.argeo.tp.sys/jni/org_eclipse_angus_mail_mbox/.gitignore b/rebuild/org.argeo.tp.sys/jni/org_eclipse_angus_mail_mbox/.gitignore
new file mode 100644 (file)
index 0000000..9b838de
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/jni/org_eclipse_angus_mail_mbox/.gitignore
@@ -0,0 +1,2 @@
+/*.h
+/*.c

diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.classpath b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.classpath
new file mode 100644 (file)
index 0000000..ca9ba96
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+               <attributes>
+                       <attribute name="module" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.gitignore b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.gitignore
new file mode 100644 (file)
index 0000000..668266f
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.gitignore
@@ -0,0 +1,2 @@
+/src/
+/bin/
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.project b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.project
new file mode 100644 (file)
index 0000000..c003462
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>com.sun.mail.mbox</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>

diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/META-INF/.gitignore
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF

diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/bnd.bnd
new file mode 100644 (file)
index 0000000..b486982
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/bnd.bnd
@@ -0,0 +1,10 @@
+Export-Package: org.eclipse.angus.mail.*
+
+Import-Package: \
+jakarta.mail.event,\
+org.graalvm.*;resolution:="optional",\
+*
+
+major: 2
+minor: 0
+micro: 2

diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/build.properties b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/build.properties
new file mode 100644 (file)
index 0000000..34d2e4d
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

diff --git a/rebuild/org.argeo.tp.sys/src/.gitignore b/rebuild/org.argeo.tp.sys/src/.gitignore
new file mode 100644 (file)
index 0000000..a738803
--- /dev/null
+++ b/rebuild/org.argeo.tp.sys/src/.gitignore
@@ -0,0 +1 @@
+angus-mail/
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
deleted file mode 100644 (file)
index ad9857c..0000000
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-include ../../sdk.mk
-.PHONY: clean all osgi
-
-export NO_SDK_LEGAL := true
-
-A2_CATEGORY = org.argeo.tp.sys
-
-MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
-MBOX_TARGET_EXEC=libmbox.so
-
-## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
-ANGUS_BRANCH=2.0
-ANGUS_VERSION=$(ANGUS_BRANCH).2
-
-all: retrieve-angus-mbox osgi jni-angus-mbox
-
-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_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC)
-       
-uninstall: osgi-uninstall
-       $(RM) $(A2_NATIVE_INSTALL_TARGET)/$(MBOX_TARGET_EXEC)
-       @if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
-
-retrieve-angus-mbox: SRC_DIR=src/angus-mail
-retrieve-angus-mbox:
-       rm -rf $(SRC_DIR)
-       mkdir -p $(SRC_DIR)
-#git -C $(SRC_DIR) init
-#git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git
-#git -C $(SRC_DIR) config core.sparseCheckout true
-#echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
-#git -C $(SRC_DIR) pull origin 1.6.7
-       git clone --branch $(ANGUS_VERSION) https://github.com/eclipse-ee4j/angus-mail.git $(SRC_DIR)
-       rm -rf $(SRC_DIR)/.git
-       rsync -a --delete --exclude module-info.java $(SRC_DIR)/providers/mbox/src/main/java/ org.eclipse.angus.mail.mbox/src
-       # jni
-       rsync -a $(SRC_DIR)/providers/mbox/src/main/cpp/org/eclipse/angus/mail/mbox/ $(MBOX_JNI_SRC)
-       mkdir -p org.eclipse.angus.mail.mbox/bin
-       javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
-       rm -rf org.eclipse.angus.mail.mbox/bin
-
-
-BUNDLES = \
-org.eclipse.angus.mail.mbox \
-
-clean:
-       rm -rf $(BUILD_BASE)
-
-DEP_CATEGORIES = org.argeo.tp.sys
-
-include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
-
-A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
-
-jni-angus-mbox:
-       mkdir -p $(A2_NATIVE_CATEGORY)
-       $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
-        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).$(ANGUS_BRANCH) \
-        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
-

diff --git a/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore
deleted file mode 100644 (file)
index 9b838de..0000000
--- a/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.h
-/*.c

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath
deleted file mode 100644 (file)
index ca9ba96..0000000
--- a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-               <attributes>
-                       <attribute name="module" value="true"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore
deleted file mode 100644 (file)
index 668266f..0000000
--- a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/
-/bin/
\ No newline at end of file

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project
deleted file mode 100644 (file)
index c003462..0000000
--- a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>com.sun.mail.mbox</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
--- a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd
deleted file mode 100644 (file)
index b486982..0000000
--- a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd
+++ /dev/null
@@ -1,10 +0,0 @@
-Export-Package: org.eclipse.angus.mail.*
-
-Import-Package: \
-jakarta.mail.event,\
-org.graalvm.*;resolution:="optional",\
-*
-
-major: 2
-minor: 0
-micro: 2

diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
--- a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/rebuild/org.argeo.tp.utils/src/.gitignore b/rebuild/org.argeo.tp.utils/src/.gitignore
deleted file mode 100644 (file)
index a738803..0000000
--- a/rebuild/org.argeo.tp.utils/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-angus-mail/
\ No newline at end of file