Argeo Build can build itself

[cc0/argeo-build.git] / src / org / argeo / build / Repackage.java

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 35979c01a90e381d504c5f45d3dd90f5caa71b70..05ff7b177616cd4e01118d3c32e15aea9a717b4a 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -51,12 +51,20 @@ import java.util.zip.Deflater;
 import aQute.bnd.osgi.Analyzer;
 import aQute.bnd.osgi.Jar;
 
-/** The central class for A2 packaging. */
+/**
+ * Simple tool repackaging existing jar files into OSGi bundles in an A2
+ * repository.
+ */
 public class Repackage {
        private final static Logger logger = System.getLogger(Repackage.class.getName());
 
-       private final static String ENV_BUILD_SOURCE_BUNDLES = "BUILD_SOURCE_BUNDLES";
+       /**
+        * Environment variable on whether sources should be packaged separately or
+        * integrated in the bundles.
+        */
+       private final static String ENV_SOURCE_BUNDLES = "SOURCE_BUNDLES";
 
+       /** Whethere repackaging should run in parallel or sequentially. */
        private final static boolean parallel = true;
 
        /** Main entry point. */
@@ -83,23 +91,30 @@ public class Repackage {
        private final static String COMMON_BND = "common.bnd";
        private final static String MERGE_BND = "merge.bnd";
 
+       /** Directory where to download archives */
        private Path originBase;
+       /** Directory where to download Maven artifacts */
        private Path mavenBase;
 
+       /** A2 repository base for binary bundles */
        private Path a2Base;
+       /** A2 repository base for source bundles */
        private Path a2SrcBase;
+       /** A2 base for native components */
        private Path a2LibBase;
+       /** Location of the descriptors driving the packaging */
        private Path descriptorsBase;
-
+       /** URIs of archives to download */
        private Properties uris = new Properties();
-
-       /** key is URI prefix, value list of base URLs */
+       /** Mirrors for archive download. Key is URI prefix, value list of base URLs */
        private Map<String, List<String>> mirrors = new HashMap<String, List<String>>();
 
+       /** Whether sources should be packaged separately */
        private final boolean sourceBundles;
 
+       /** Constructor initialises the various variables */
        public Repackage(Path a2Base, Path descriptorsBase) {
-               sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
+               sourceBundles = Boolean.parseBoolean(System.getenv(ENV_SOURCE_BUNDLES));
                if (sourceBundles)
                        logger.log(INFO, "Sources will be packaged separately");
 
@@ -325,12 +340,6 @@ public class Repackage {
                CategoryNameVersion nameVersion = new M2Artifact(category + ":" + bundleSymbolicName + ":" + m2Version);
 
                Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch());
-               if (Files.exists(targetBundleDir)) {
-                       logger.log(WARNING, targetBundleDir + " exists, deleting it...");
-                       deleteDirectory(targetBundleDir);
-               } else {
-                       Files.createDirectories(targetBundleDir);
-               }
 
                String[] artifacts = artifactsStr.split(",");
                artifacts: for (String str : artifacts) {
@@ -534,14 +543,7 @@ public class Repackage {
                                        ? targetBundleDir.getParent().resolve(targetBundleDir.toString() + ".src")
                                        : targetBundleDir.resolve("OSGI-OPT/src");
 
-                       if (Files.exists(targetSourceDir) && sourceBundles) {
-                               logger.log(WARNING, targetSourceDir + " exists, deleting it...");
-                               deleteDirectory(targetSourceDir);
-                       } else {
-                               Files.createDirectories(targetSourceDir);
-                       }
-
-                       // copy entries
+                       Files.createDirectories(targetSourceDir);
                        JarEntry entry;
                        entries: while ((entry = jarIn.getNextJarEntry()) != null) {
                                if (entry.isDirectory())
@@ -689,14 +691,7 @@ public class Repackage {
                                                ? targetBundleDir.getParent().resolve(targetBundleDir.toString() + ".src")
                                                : targetBundleDir.resolve("OSGI-OPT/src");
 
-                               if (Files.exists(targetSourceDir) && sourceBundles) {
-                                       logger.log(WARNING, targetSourceDir + " exists, deleting it...");
-                                       deleteDirectory(targetSourceDir);
-                               } else {
-                                       Files.createDirectories(targetSourceDir);
-                               }
-
-                               // copy entries
+                               Files.createDirectories(targetSourceDir);
                                JarEntry entry;
                                entries: while ((entry = jarIn.getNextJarEntry()) != null) {
                                        if (entry.isDirectory())
@@ -759,12 +754,6 @@ public class Repackage {
                                }
                        }
                        targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
-                       if (Files.exists(targetBundleDir)) {
-                               logger.log(WARNING, targetBundleDir + " exists, deleting it...");
-                               deleteDirectory(targetBundleDir);
-                       } else {
-                               Files.createDirectories(targetBundleDir);
-                       }
 
                        // force Java 9 module name
                        entries.put(ManifestConstants.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());
@@ -1056,7 +1045,7 @@ public class Repackage {
                // JAVA
                AUTOMATIC_MODULE_NAME("Automatic-Module-Name"), //
                // SLC
-               SLC_CATEGORY("SLC-Category"), //
+//             SLC_CATEGORY("SLC-Category"), //
                SLC_ORIGIN_M2("SLC-Origin-M2"), //
                SLC_ORIGIN_M2_MERGE("SLC-Origin-M2-Merge"), //
                SLC_ORIGIN_M2_REPO("SLC-Origin-M2-Repo"), //