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

Generate JPMS module-info
---

diff --git a/argeo.bnd b/argeo.bnd
index 9ab4015..63fc653 100644
--- a/argeo.bnd
+++ b/argeo.bnd
@@ -5,4 +5,5 @@ Bundle-RequiredExecutionEnvironment=JavaSE-17
 #-consumer-policy : ${range;[==,=+)}
 -contract: !JavaServlet,*
 -removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
-Automatic-Module-Name: ${bsn}
\ No newline at end of file
+Automatic-Module-Name: ${bsn}
+-jpms-module-info:
diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index a8341fb..b1d96e2 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -513,11 +513,11 @@ public class Make {
 
 		// Write module-info.class
 		if (moduleInfoClass != null) {
-			Path moduleInfoClassP = compiled.resolve("module-info.class");
+			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);
+//				logger.log(INFO, "Wrote " + moduleInfoClassP);
 			} catch (Exception e) {
 				throw new RuntimeException("Cannot write module-info.class");
 			}