X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=1a1f5c1d4b26fdfb768a476da0e1c832daa20ea2;hb=de19d534e689ec02c08faf7e34b471cd9c45516e;hp=b4b95c1d33fe7c5b5f253edc34bfbc3e23285266;hpb=355e405d5613237930d044d7194707b19c0b258f;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index b4b95c1..1a1f5c1 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
@@ -584,6 +604,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");
 						}
@@ -752,8 +776,6 @@ 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) {
@@ -912,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);
 							}
@@ -995,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());
@@ -1017,6 +1045,14 @@ public class Repackage {
 				nameVersion = new NameVersion(ourSymbolicName, ourVersion);
 			} else {
 				nameVersion = nameVersionFromManifest(manifest);
+				if (nameVersion == null) {
+					// hack for weird issue with JNA jar in Eclipse
+					String[] arr_ = file.getFileName().toString().split("_");
+					String v = arr_[1].substring(0, arr_[1].length() - 4);// remove .jar
+					nameVersion = new NameVersion(arr_[0], v);
+					logger.log(WARNING, file + " has no symbolic name, trying " + nameVersion.getName() + "/"
+							+ nameVersion.getVersion() + " based on its name");
+				}
 				if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
 					logger.log(WARNING,
 							"Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);
@@ -1027,6 +1063,7 @@ public class Repackage {
 					nameVersion.setName(ourSymbolicName);
 				}
 			}
+
 			bundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
 
 			// copy original MANIFEST
@@ -1052,7 +1089,6 @@ public class Repackage {
 				arch = libRelativePath.getName(1).toString();
 			}
 
-//			if (!embed) {
 			// copy entries
 			JarEntry entry;
 			entries: while ((entry = jarIn.getNextJarEntry()) != null) {
@@ -1119,7 +1155,6 @@ public class Repackage {
 					origin.deleted.add(bundleDir.relativize(target).toString());
 				}
 				logger.log(TRACE, () -> "Copied " + target);
-//				}
 			}
 		}
 
@@ -1132,11 +1167,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()) {
@@ -1455,8 +1485,13 @@ public class Repackage {
 
 			// license
 			String spdxLicenseId = SPDX_LICENSE_IDENTIFIER.get(mapping);
-			if (spdxLicenseId == null)
-				throw new IllegalStateException("An SPDX license id must have beend defined at this stage.");
+			if (spdxLicenseId == null) {
+				if (jarDir.getFileName().toString().startsWith("com.sun.jna"))
+					spdxLicenseId = "Apache-2.0 OR LGPL-2.1";
+				else
+					throw new IllegalStateException(
+							"An SPDX license id must have beend defined for " + jarDir + " at this stage.");
+			}
 			writer.append("\nIt is redistributed under the following license:\n\n");
 			writer.append("SPDX-Identifier: " + spdxLicenseId + "\n\n");