X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=a6c84edd81f627e86410707cfbf81b364078dcdf;hb=13abf513d6d3da1495eb4e4a6024504060a93cde;hp=3c03a10cee78dffee8b01b09b2678667dbcd6af9;hpb=49e764ff86e256549b22d16f66369a73cfbc5d3d;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 3c03a10..a6c84ed 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1473,30 +1473,31 @@ 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");
 
 			// origin
-			String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
-			String originDesc = ARGEO_ORIGIN_M2.get(mapping);
+			String originDesc = ARGEO_ORIGIN_URI.get(mapping);
 			if (originDesc != null)
-				writer.append("The original component has M2 coordinates:\n" + originDesc.replace(',', '\n') + "\n"
-						+ (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
+				writer.append("\nThe original component comes from " + originDesc + ".\n");
 			else {
-				originDesc = ARGEO_ORIGIN_URI.get(mapping);
+				String m2Repo = ARGEO_ORIGIN_M2_REPO.get(mapping);
+				originDesc = ARGEO_ORIGIN_M2.get(mapping);
 				if (originDesc != null)
-					writer.append("The original component comes from " + originDesc + ".\n");
+					writer.append("\nThe original component has M2 coordinates:\n" + originDesc.replace(',', '\n')
+							+ "\n" + (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
 				else
 					logger.log(ERROR, "Cannot find origin information in " + jarDir);
 			}
 			String originSources = ARGEO_ORIGIN_SOURCES_URI.get(mapping);
 			if (originSources != null)
-				writer.append("The original sources come from " + originDesc + ".\n");
+				writer.append("\nThe 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");
@@ -1504,7 +1505,6 @@ public class Repackage {
 					writer.append("Corresponding sources are available under OSGI-OPT/src.\n");
 			}
 		}
-
 	}
 
 	/**
@@ -1523,6 +1523,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)) {