From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Mar 2023 06:03:08 +0000 (+0100)
Subject: Improve sources readme
X-Git-Tag: v2.3.5~8
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=73a406a81fdf14a93367c94ca915a72fed8945b8;p=cc0%2Fargeo-build.git

Improve sources readme
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 3c03a10..538c4ee 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -752,6 +752,8 @@ public class Repackage {
 			URL sourcesUrl = alternateUri != null ? new URL(alternateUri)
 					: M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
 			Path sourcesDownloaded = downloadMaven(sourcesUrl, sourcesArtifact);
+			if (!props.containsKey(ARGEO_ORIGIN_SOURCES_URI.toString()))
+				ARGEO_ORIGIN_SOURCES_URI.put(props, sourcesUrl.toString());
 			processM2SourceJar(sourcesDownloaded, targetBundleDir, merging ? artifact : null, unmodified);
 			logger.log(TRACE, () -> "Processed source " + sourcesDownloaded);
 		} catch (Exception e) {
@@ -1473,7 +1475,7 @@ public class Repackage {
 				if (url != null) {
 					writer.write("which is available here: " + url + "\n");
 				} else {
-					logger.log(ERROR, "No licne URL for " + jarDir);
+					logger.log(ERROR, "No licence URL for " + jarDir);
 				}
 			}
 			writer.write("\n");
@@ -1493,10 +1495,12 @@ public class Repackage {
 			}
 			String originSources = ARGEO_ORIGIN_SOURCES_URI.get(mapping);
 			if (originSources != null)
-				writer.append("The original sources come from " + originDesc + ".\n");
+				writer.append("The original sources come from " + originSources + ".\n");
 
-			if (!jarDir.getFileName().endsWith(".src")) {// binary archive
+			if (Files.exists(jarDir.resolve(CHANGES)))
 				writer.append("\nA detailed list of changes is available under " + CHANGES + ".\n");
+
+			if (!jarDir.getFileName().toString().endsWith(".src")) {// binary archive
 				if (separateSources)
 					writer.append("Corresponding sources are available in the related archive named "
 							+ jarDir.toString() + ".src.jar.\n");
@@ -1523,6 +1527,8 @@ public class Repackage {
 
 		/** Append changes to the A2-ORIGIN/changes file. */
 		void appendChanges(Path baseDirectory) throws IOException {
+			if (modified.isEmpty() && deleted.isEmpty() && added.isEmpty() && moved.isEmpty())
+				return; // no changes
 			Path changesFile = baseDirectory.resolve(CHANGES);
 			Files.createDirectories(changesFile.getParent());
 			try (BufferedWriter writer = Files.newBufferedWriter(changesFile, APPEND, CREATE)) {