From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 12 Apr 2024 11:10:42 +0000 (+0200)
Subject: Generate JPMS module-info
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=76ebab1b58a74c696cd696ce0be65c2204ebbc60;p=cc0%2Fargeo-build.git

Generate JPMS module-info
---

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 05f95b3..a8341fb 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -494,7 +494,7 @@ public class Make {
 			jar.setManifest(manifest);
 			JPMSModuleInfoPlugin jpmsModuleInfoPlugin = new JPMSModuleInfoPlugin();
 			jpmsModuleInfoPlugin.verify(bndAnalyzer);
-			moduleInfoClass = jar.getResource("module-info.class");
+			moduleInfoClass = bndAnalyzer.getJar().getResource("module-info.class");
 		} catch (Exception e) {
 			throw new RuntimeException("Bnd analysis of " + compiled + " failed", e);
 		}
@@ -517,6 +517,7 @@ public class Make {
 			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");
 			}