X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=6f5fbf83e9083b250c793fea6adabaa023bc3401;hb=266a8b7d16aa2f6c071b9e743d6267845dae7516;hp=18b1487cb91707ccd5e30d0ed28bd34fe12935eb;hpb=65b6bbdad8e7584f816c1a3ed88b54e114d1eaa3;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 18b1487..6f5fbf8 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]);
+			factory.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,25 @@ public class Repackage {
 		logger.log(INFO, "# License summary:\n" + sb);
 	}
 
+	/** Deletes remaining sub directories. */
+	void cleanPreviousFailedBuild(Path categoryPath) {
+		Path outputCategoryPath = a2Base.resolve(categoryPath);
+		if (!Files.exists(outputCategoryPath))
+			return;
+		// clean previous failed build
+		try {
+			for (Path subDir : Files.newDirectoryStream(outputCategoryPath, (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
@@ -687,7 +707,8 @@ public class Repackage {
 				}
 
 				if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) {
-					fileProps.put(EXPORT_PACKAGE.toString(), "*");
+					fileProps.put(EXPORT_PACKAGE.toString(),
+							"*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\"");
 				}
 
 				// BND analysis
@@ -913,6 +934,10 @@ public class Repackage {
 									map.put(key.toString(), commonProps.getProperty(key.toString()));
 								A2Origin origin = new A2Origin();
 								Path bundleDir = processBundleJar(file, targetCategoryBase, map, origin);
+								if (bundleDir == null) {
+									logger.log(WARNING, "No bundle dir created for " + file + ", skipping...");
+									return FileVisitResult.CONTINUE;
+								}
 								origins.put(bundleDir, origin);
 								logger.log(DEBUG, () -> "Processed " + file);
 							}
@@ -996,6 +1021,8 @@ public class Repackage {
 		Manifest sourceManifest;
 		try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
 			sourceManifest = jarIn.getManifest();
+			if (sourceManifest == null)
+				logger.log(WARNING, file + " has no manifest");
 			manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
 
 			String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString());
@@ -1018,6 +1045,8 @@ public class Repackage {
 				nameVersion = new NameVersion(ourSymbolicName, ourVersion);
 			} else {
 				nameVersion = nameVersionFromManifest(manifest);
+				if (nameVersion == null)
+					throw new IllegalStateException("Could not compute name/version from Manifest");
 				if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
 					logger.log(WARNING,
 							"Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);
@@ -1028,6 +1057,7 @@ public class Repackage {
 					nameVersion.setName(ourSymbolicName);
 				}
 			}
+
 			bundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
 
 			// copy original MANIFEST
@@ -1053,7 +1083,6 @@ public class Repackage {
 				arch = libRelativePath.getName(1).toString();
 			}
 
-//			if (!embed) {
 			// copy entries
 			JarEntry entry;
 			entries: while ((entry = jarIn.getNextJarEntry()) != null) {
@@ -1120,7 +1149,6 @@ public class Repackage {
 					origin.deleted.add(bundleDir.relativize(target).toString());
 				}
 				logger.log(TRACE, () -> "Copied " + target);
-//				}
 			}
 		}
 
@@ -1133,11 +1161,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()) {