X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=67246d527d3d17920579a2ec106e9d08de388225;hb=a8a1725244e8daa2ad1b59d202784300d23a7a56;hp=b0066ac99bdf7ca0295b1bef5aef8e04efe4e882;hpb=dc142b1688d1163ae5afe93fd39bec0fda62c71a;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index b0066ac..67246d5 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -45,6 +45,8 @@ 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
@@ -481,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);
 		}
@@ -502,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");
@@ -656,7 +677,7 @@ public class Make {
 	Map<String, Path> listLegalFilesToInclude(Path bundleBase) throws IOException {
 		Map<String, Path> toInclude = new HashMap<>();
 		if (!noSdkLegal) {
-			DirectoryStream<Path> sdkSrcLegal = Files.newDirectoryStream(sdkSrcBase, (p) -> {
+			try (DirectoryStream<Path> sdkSrcLegal = Files.newDirectoryStream(sdkSrcBase, (p) -> {
 				String fileName = p.getFileName().toString();
 				return switch (fileName) {
 				case "NOTICE":
@@ -667,9 +688,10 @@ public class Make {
 				default:
 					yield false;
 				};
-			});
-			for (Path p : sdkSrcLegal)
-				toInclude.put(p.getFileName().toString(), p);
+			});) {
+				for (Path p : sdkSrcLegal)
+					toInclude.put(p.getFileName().toString(), p);
+			}
 		}
 		for (Iterator<Map.Entry<String, Path>> entries = toInclude.entrySet().iterator(); entries.hasNext();) {
 			Map.Entry<String, Path> entry = entries.next();