From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Mar 2023 05:47:45 +0000 (+0100)
Subject: Fix sources base directory in Repackage
X-Git-Tag: v2.3.5~109
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=59c4f98460a3a199ce2c0340a43f0b517edaacfc;hp=e2f2807d031e85076b392441e8648ea8d95b7fbb;p=cc0%2Fargeo-build.git

Fix sources base directory in Repackage
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index cf6adda..b0e6677 100644
--- 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;
 
@@ -102,6 +103,7 @@ public class Repackage {
 		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))
@@ -1015,9 +1017,10 @@ public class Repackage {
 				return jarPath;
 
 			}
-			Path guessedA2Base = bundleCategoryDir.getParent();
-			Path srcA2Base = guessedA2Base.getParent().resolve(guessedA2Base.getFileName() + ".src");
-			Path srcJarP = srcA2Base.resolve(bundleCategoryDir.getFileName()).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();