X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=310c6ca186bc974eecf72ba1c9ace6adc5269f86;hb=fcb10e7247b6eb7cbd2dbd9b49e029596ba5436a;hp=a6c84edd81f627e86410707cfbf81b364078dcdf;hpb=063d4d281e8de776823d9c298af60bd0e623fbae;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index a6c84ed..310c6ca 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -98,13 +98,14 @@ public class Repackage {
 
 		List<CompletableFuture<Void>> toDos = new ArrayList<>();
 		for (int i = 1; i < args.length; i++) {
-			Path p = Paths.get(args[i]);
-			if (sequential)
-				factory.processCategory(p);
+			Path categoryPath = Paths.get(args[i]);
+			cleanPreviousFailedBuild(categoryPath);
+			if (sequential) // sequential processing happens here
+				factory.processCategory(categoryPath);
 			else
-				toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(p)));
+				toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(categoryPath)));
 		}
-		if (!sequential)
+		if (!sequential)// parallel processing
 			CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join();
 
 		// Summary
@@ -115,6 +116,22 @@ public class Repackage {
 		logger.log(INFO, "# License summary:\n" + sb);
 	}
 
+	/** Deletes remaining sub directories. */
+	static void cleanPreviousFailedBuild(Path categoryPath) {
+		// clean previous failed build
+		try {
+			for (Path subDir : Files.newDirectoryStream(categoryPath, (d) -> Files.isDirectory(d))) {
+				if (Files.exists(subDir)) {
+					logger.log(WARNING, "Bundle dir " + subDir
+							+ " already exists, probably from a previous failed build, deleting it...");
+					deleteDirectory(subDir);
+				}
+			}
+		} catch (IOException e) {
+			logger.log(ERROR, "Cannot clean previous build", e);
+		}
+	}
+
 	/** MANIFEST headers. */
 	enum ManifestHeader {
 		// OSGi
@@ -584,6 +601,10 @@ public class Repackage {
 						} else if (entry.getName().startsWith("org/apache/batik/")) {
 							logger.log(TRACE, "Skip " + entry.getName());
 							continue entries;
+						} else if (entry.getName().startsWith("META-INF/NOTICE")) {
+							logger.log(WARNING, "Skip " + entry.getName() + " from " + artifact);
+							// TODO merge them?
+							continue entries;
 						} else {
 							throw new IllegalStateException("File " + target + " from " + artifact + " already exists");
 						}
@@ -683,8 +704,7 @@ public class Repackage {
 				}
 
 				if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) {
-					fileProps.put(EXPORT_PACKAGE.toString(),
-							"*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\"");
+					fileProps.put(EXPORT_PACKAGE.toString(), "*");
 				}
 
 				// BND analysis
@@ -1025,6 +1045,7 @@ public class Repackage {
 					nameVersion.setName(ourSymbolicName);
 				}
 			}
+
 			bundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
 
 			// copy original MANIFEST
@@ -1050,7 +1071,6 @@ public class Repackage {
 				arch = libRelativePath.getName(1).toString();
 			}
 
-//			if (!embed) {
 			// copy entries
 			JarEntry entry;
 			entries: while ((entry = jarIn.getNextJarEntry()) != null) {
@@ -1117,7 +1137,6 @@ public class Repackage {
 					origin.deleted.add(bundleDir.relativize(target).toString());
 				}
 				logger.log(TRACE, () -> "Copied " + target);
-//				}
 			}
 		}
 
@@ -1130,11 +1149,6 @@ public class Repackage {
 					entries.get(BUNDLE_SYMBOLICNAME.toString()) + ";singleton:=true");
 		}
 
-//		if (embed) {// copy embedded jar
-//			Files.copy(file, bundleDir.resolve(file.getFileName()));
-//			entries.put(ManifestHeader.BUNDLE_CLASSPATH.toString(), file.getFileName().toString());
-//		}
-
 		// Final MANIFEST decisions
 		// We also check the original OSGi metadata and compare with our changes
 		for (String key : entries.keySet()) {