Fix sources base directory in Repackage

[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 4f0089a3204fb8e1803b155f99e33efa4117303d..b0e667716d91fb42e4ea3ad22105b92cbc757fc9 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -82,6 +82,7 @@ public class Repackage {
 
        private Path originBase;
        private Path a2Base;
+       private Path a2SrcBase;
        private Path a2LibBase;
        private Path descriptorsBase;
 
@@ -93,19 +94,16 @@ public class Repackage {
        private final boolean sourceBundles;
 
        public Repackage(Path a2Base, Path descriptorsBase) {
-               if (System.getenv(ENV_BUILD_SOURCE_BUNDLES) != null) {
-                       sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
-                       if (sourceBundles)
-                               logger.log(Level.INFO, "Sources will be packaged separately");
-               } else {
-                       sourceBundles = true;
-               }
+               sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
+               if (sourceBundles)
+                       logger.log(Level.INFO, "Sources will be packaged separately");
 
                Objects.requireNonNull(a2Base);
                Objects.requireNonNull(descriptorsBase);
                this.originBase = Paths.get(System.getProperty("user.home"), ".cache", "argeo/build/origin");
                // TODO define and use a build base
                this.a2Base = a2Base;
+               this.a2SrcBase = a2Base.getParent().resolve(a2Base.getFileName() + ".src");
                this.a2LibBase = a2Base.resolve("lib");
                this.descriptorsBase = descriptorsBase;
                if (!Files.exists(this.descriptorsBase))
@@ -1012,12 +1010,19 @@ public class Repackage {
                deleteDirectory(bundleDir);
 
                if (sourceBundles) {
-                       Path sourceDir = bundleDir.getParent().resolve(bundleDir.toString() + ".src");
+                       Path bundleCategoryDir = bundleDir.getParent();
+                       Path sourceDir = bundleCategoryDir.resolve(bundleDir.toString() + ".src");
                        if (!Files.exists(sourceDir)) {
                                logger.log(WARNING, sourceDir + " does not exist, skipping...");
                                return jarPath;
+
                        }
-                       Path srcJarP = sourceDir.getParent().resolve(sourceDir.getFileName() + ".jar");
+
+                       Path relPath = a2Base.relativize(bundleCategoryDir);
+                       Path srcCategoryDir = a2SrcBase.resolve(relPath);
+                       Path srcJarP = srcCategoryDir.resolve(sourceDir.getFileName() + ".jar");
+                       Files.createDirectories(srcJarP.getParent());
+
                        String bundleSymbolicName = manifest.getMainAttributes().getValue("Bundle-SymbolicName").toString();
                        // in case there are additional directives
                        bundleSymbolicName = bundleSymbolicName.split(";")[0];