X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=b1d96e2ee9c710d9d86d69f4645722d8c872a5a7;hb=09077e4ece9ea6d8e0b442084a80103bd5733b4b;hp=9f6f0846d1a6447c7664bb04ad66db3f5451a482;hpb=0057183fefa56b30bb175dce9fd9b6933b980288;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 9f6f084..b1d96e2 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -38,12 +38,15 @@ import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
+import java.util.stream.Collectors;
 import java.util.zip.Deflater;
 
 import org.eclipse.jdt.core.compiler.CompilationProgress;
 
 import aQute.bnd.osgi.Analyzer;
 import aQute.bnd.osgi.Jar;
+import aQute.bnd.osgi.Resource;
+import aQute.bnd.plugin.jpms.JPMSModuleInfoPlugin;
 
 /**
  * Minimalistic OSGi compiler and packager, meant to be used as a single file
@@ -175,7 +178,8 @@ public class Make {
 
 		List<String> a2Categories = options.getOrDefault("--dep-categories", new ArrayList<>());
 		List<String> a2Bases = options.getOrDefault("--a2-bases", new ArrayList<>());
-		if (a2Bases.isEmpty() || !a2Bases.contains(a2Output.toString())) {
+		a2Bases = a2Bases.stream().distinct().collect(Collectors.toList());// remove duplicates
+		if (a2Bases.isEmpty() || !a2Bases.contains(a2Output.toString())) {// make sure a2 output is available
 			a2Bases.add(a2Output.toString());
 		}
 
@@ -204,10 +208,9 @@ public class Make {
 							A2Jar current = a2Jars.get(a2Jar.name);
 							if (a2Jar.major > current.major)
 								a2Jars.put(a2Jar.name, a2Jar);
-							else if (a2Jar.major == current.major //
-									// if minor equals, we take the last one
-									&& a2Jar.minor >= current.minor)
+							else if (a2Jar.major == current.major && a2Jar.minor > current.minor)
 								a2Jars.put(a2Jar.name, a2Jar);
+							// keep if minor equals
 						} else {
 							a2Jars.put(a2Jar.name, a2Jar);
 						}
@@ -380,7 +383,7 @@ public class Make {
 				Path targetParent = targetJarP.getParent();
 				if (targetParent.startsWith(targetA2))
 					deleteEmptyParents(targetA2, targetParent);
-				if (targetParent.startsWith(nativeTargetA2))
+				if (nativeTargetA2 != null && targetParent.startsWith(nativeTargetA2))
 					deleteEmptyParents(nativeTargetA2, targetParent);
 			} else { // install
 				Files.createDirectories(targetJarP.getParent());
@@ -416,6 +419,14 @@ public class Make {
 
 	/** Delete empty parent directory up to the base directory (included). */
 	void deleteEmptyParents(Path baseDir, Path targetParent) throws IOException {
+		if (!targetParent.startsWith(baseDir))
+			throw new IllegalArgumentException(targetParent + " does not start with " + baseDir);
+		if (!Files.exists(baseDir))
+			return;
+		if (!Files.exists(targetParent)) {
+			deleteEmptyParents(baseDir, targetParent.getParent());
+			return;
+		}
 		if (!Files.isDirectory(targetParent))
 			throw new IllegalArgumentException(targetParent + " must be a directory");
 		boolean isA2target = Files.isSameFile(baseDir, targetParent);
@@ -472,11 +483,18 @@ public class Make {
 		if (!Files.exists(binP))
 			Files.createDirectories(binP);
 		Manifest manifest;
+		Resource moduleInfoClass = null;
 		try (Analyzer bndAnalyzer = new Analyzer()) {
 			bndAnalyzer.setProperties(properties);
 			Jar jar = new Jar(bundleSymbolicName, binP.toFile());
 			bndAnalyzer.setJar(jar);
 			manifest = bndAnalyzer.calcManifest();
+
+			// JPMS module
+			jar.setManifest(manifest);
+			JPMSModuleInfoPlugin jpmsModuleInfoPlugin = new JPMSModuleInfoPlugin();
+			jpmsModuleInfoPlugin.verify(bndAnalyzer);
+			moduleInfoClass = bndAnalyzer.getJar().getResource("module-info.class");
 		} catch (Exception e) {
 			throw new RuntimeException("Bnd analysis of " + compiled + " failed", e);
 		}
@@ -493,6 +511,18 @@ public class Make {
 			manifest.write(out);
 		}
 
+		// Write module-info.class
+		if (moduleInfoClass != null) {
+			Path moduleInfoClassP = binP.resolve("module-info.class");
+			Files.createDirectories(moduleInfoClassP.getParent());
+			try (OutputStream out = Files.newOutputStream(moduleInfoClassP)) {
+				moduleInfoClass.write(out);
+//				logger.log(INFO, "Wrote " + moduleInfoClassP);
+			} catch (Exception e) {
+				throw new RuntimeException("Cannot write module-info.class");
+			}
+		}
+
 		// Load excludes
 		List<PathMatcher> excludes = new ArrayList<>();
 		Path excludesP = argeoBuildBase.resolve("excludes.txt");