From 403df1d4aab722907b4b2f6d1cec65026f410fc4 Mon Sep 17 00:00:00 2001
From: Nicolas Pavie <pavie.nicolas@gmail.com>
Date: Wed, 22 Nov 2023 08:56:08 +0100
Subject: [PATCH 1/2] Add jdk.jdwp.agent for debugging

Add an alternative JRE pom file to build it with jdk.jdwp.agent
included, allowing to do remote debugging on it.

Modified the Makefile to only use this file when a make is called with
`make DEV=1 ...`.
---
 Makefile          |  21 +++++-
 build-jre-dev.xml | 174 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+), 3 deletions(-)
 create mode 100644 build-jre-dev.xml

diff --git a/Makefile b/Makefile
index ec23843f..245c426e 100644
--- a/Makefile
+++ b/Makefile
@@ -465,25 +465,40 @@ endif
 ifeq ($(OS), MACOSX)
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 -Pbuild-jre-mac : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
-	rm("target/classes");                                \
+	rm("target/classes");
+ifdef DEV
+	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
+	     "$(MVN)", "-f", "build-jre-dev.xml", "jlink:jlink", "$@");
+else
 	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
+endif # DEV
 endif
 else ifeq ($(OS), WINDOWS)
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
-	rm("target/classes");                                \
+	rm("target/classes");
+ifdef DEV
+	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
+	     "$(MVN)", "-f", "build-jre-dev.xml", "jlink:jlink", "$@");
+else
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
 endif
+endif
 else
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
-	rm("target/classes");                                \
+	rm("target/classes");
+ifdef DEV
+	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
+	     "$(MVN)", "-f", "build-jre-dev.xml", "jlink:jlink", "$@");
+else
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
 endif
 endif
+endif
 
 # for dependencies to jmods
 -Pbuild-jre-mac   : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
diff --git a/build-jre-dev.xml b/build-jre-dev.xml
new file mode 100644
index 00000000..b1a88b0b
--- /dev/null
+++ b/build-jre-dev.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.daisy</groupId>
+    <artifactId>daisy</artifactId>
+    <version>5</version>
+    <relativePath />
+  </parent>
+  <groupId>org.daisy.pipeline</groupId>
+  <artifactId>jre</artifactId>
+  <version>0.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jlink-plugin</artifactId>
+          <version>3.1.0</version>
+          <configuration>
+            <noHeaderFiles>true</noHeaderFiles>
+            <noManPages>true</noManPages>
+            <compress>1</compress>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <profiles>
+    <profile>
+      <id>build-jre-linux</id>
+      <!--
+          this profile needs to be run with JDK 17
+      -->
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-jlink-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id> <!-- run directly from Makefile -->
+                <goals>
+                  <goal>jlink</goal>
+                </goals>
+                <configuration>
+                  <classifier>linux</classifier>
+                  <addModules>
+                    <addModule>java.base</addModule>
+                    <addModule>java.desktop</addModule>
+                    <addModule>java.instrument</addModule>
+                    <addModule>java.security.jgss</addModule>
+                    <addModule>java.scripting</addModule> <!-- for gui -->
+                    <addModule>java.sql</addModule>
+                    <addModule>java.xml</addModule>
+                    <addModule>jdk.management.agent</addModule>
+                    <addModule>jdk.unsupported</addModule> <!-- for gui -->
+                    <addModule>jdk.zipfs</addModule>
+                    <addModule>jdk.jdwp.agent</addModule>
+                  </addModules>
+                  <modulePaths>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
+                  </modulePaths>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-jre-mac</id>
+      <!--
+          this profile needs to be run with JDK 17
+      -->
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-jlink-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id> <!-- run directly from Makefile -->
+                <configuration>
+                  <classifier>mac</classifier>
+                  <addModules>
+                    <addModule>java.base</addModule>
+                    <addModule>java.desktop</addModule>
+                    <addModule>java.instrument</addModule>
+                    <addModule>java.security.jgss</addModule>
+                    <addModule>java.scripting</addModule> <!-- for gui -->
+                    <addModule>java.sql</addModule>
+                    <addModule>java.xml</addModule>
+                    <addModule>jdk.management.agent</addModule>
+                    <addModule>jdk.unsupported</addModule> <!-- for gui -->
+                    <addModule>jdk.zipfs</addModule>
+                    <addModule>jdk.jdwp.agent</addModule>
+                  </addModules>
+                  <modulePaths>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7/Contents/Home/jmods</modulePath>
+                  </modulePaths>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-jre-win32</id>
+      <!--
+          this profile needs to be run with JDK 17
+      -->
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-jlink-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id> <!-- run directly from Makefile -->
+                <configuration>
+                  <classifier>win32</classifier>
+                  <addModules>
+                    <addModule>java.base</addModule>
+                    <addModule>java.desktop</addModule>
+                    <addModule>java.instrument</addModule>
+                    <addModule>java.sql</addModule>
+                    <addModule>java.xml</addModule>
+                    <addModule>jdk.management.agent</addModule>
+                    <addModule>jdk.zipfs</addModule>
+                    <addModule>jdk.jdwp.agent</addModule>s
+                  </addModules>
+                  <modulePaths>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
+                  </modulePaths>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>build-jre-win64</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-jlink-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id> <!-- run directly from Makefile -->
+                <configuration>
+                  <classifier>win64</classifier>
+                  <addModules>
+                    <addModule>java.base</addModule>
+                    <addModule>java.desktop</addModule>
+                    <addModule>java.instrument</addModule>
+                    <addModule>java.sql</addModule>
+                    <addModule>java.xml</addModule>
+                    <addModule>jdk.management.agent</addModule>
+                    <addModule>jdk.zipfs</addModule>
+                    <addModule>jdk.jdwp.agent</addModule>
+                  </addModules>
+                  <modulePaths>
+                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
+                  </modulePaths>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

From 2a0cd951e00cdc6b1e15876c8bdfd40db69f6611 Mon Sep 17 00:00:00 2001
From: Bert Frees <bertfrees@gmail.com>
Date: Wed, 6 Dec 2023 17:03:10 +0100
Subject: [PATCH 2/2] Remove duplication and rename DEV to FOR_DEBUGGING

---
 Makefile          |  14 ++--
 build-jre-dev.xml | 174 ----------------------------------------------
 build-jre.xml     |  17 +++++
 3 files changed, 24 insertions(+), 181 deletions(-)
 delete mode 100644 build-jre-dev.xml

diff --git a/Makefile b/Makefile
index 245c426e..00abcde3 100644
--- a/Makefile
+++ b/Makefile
@@ -466,21 +466,21 @@ ifeq ($(OS), MACOSX)
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64 -Pbuild-jre-mac : src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
 	rm("target/classes");
-ifdef DEV
+ifdef FOR_DEBUGGING
 	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
-	     "$(MVN)", "-f", "build-jre-dev.xml", "jlink:jlink", "$@");
+	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@", "-Pinclude-jdwp-agent");
 else
 	exec(env("JAVA_HOME", "$(CURDIR)/$</Contents/Home"), \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
-endif # DEV
+endif # FOR_DEBUGGING
 endif
 else ifeq ($(OS), WINDOWS)
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
 	rm("target/classes");
-ifdef DEV
+ifdef FOR_DEBUGGING
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
-	     "$(MVN)", "-f", "build-jre-dev.xml", "jlink:jlink", "$@");
+	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@", "-Pinclude-jdwp-agent");
 else
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
@@ -490,9 +490,9 @@ else
 -Pbuild-jre-linux -Pbuild-jre-win32 -Pbuild-jre-win64                 : src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7
 ifndef DUMP_PROFILES
 	rm("target/classes");
-ifdef DEV
+ifdef FOR_DEBUGGING
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
-	     "$(MVN)", "-f", "build-jre-dev.xml", "jlink:jlink", "$@");
+	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@", "-Pinclude-jdwp-agent");
 else
 	exec(env("JAVA_HOME", "$(CURDIR)/$<"),               \
 	     "$(MVN)", "-f", "build-jre.xml", "jlink:jlink", "$@");
diff --git a/build-jre-dev.xml b/build-jre-dev.xml
deleted file mode 100644
index b1a88b0b..00000000
--- a/build-jre-dev.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.daisy</groupId>
-    <artifactId>daisy</artifactId>
-    <version>5</version>
-    <relativePath />
-  </parent>
-  <groupId>org.daisy.pipeline</groupId>
-  <artifactId>jre</artifactId>
-  <version>0.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jlink-plugin</artifactId>
-          <version>3.1.0</version>
-          <configuration>
-            <noHeaderFiles>true</noHeaderFiles>
-            <noManPages>true</noManPages>
-            <compress>1</compress>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <profiles>
-    <profile>
-      <id>build-jre-linux</id>
-      <!--
-          this profile needs to be run with JDK 17
-      -->
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jlink-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-cli</id> <!-- run directly from Makefile -->
-                <goals>
-                  <goal>jlink</goal>
-                </goals>
-                <configuration>
-                  <classifier>linux</classifier>
-                  <addModules>
-                    <addModule>java.base</addModule>
-                    <addModule>java.desktop</addModule>
-                    <addModule>java.instrument</addModule>
-                    <addModule>java.security.jgss</addModule>
-                    <addModule>java.scripting</addModule> <!-- for gui -->
-                    <addModule>java.sql</addModule>
-                    <addModule>java.xml</addModule>
-                    <addModule>jdk.management.agent</addModule>
-                    <addModule>jdk.unsupported</addModule> <!-- for gui -->
-                    <addModule>jdk.zipfs</addModule>
-                    <addModule>jdk.jdwp.agent</addModule>
-                  </addModules>
-                  <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
-                  </modulePaths>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>build-jre-mac</id>
-      <!--
-          this profile needs to be run with JDK 17
-      -->
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jlink-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-cli</id> <!-- run directly from Makefile -->
-                <configuration>
-                  <classifier>mac</classifier>
-                  <addModules>
-                    <addModule>java.base</addModule>
-                    <addModule>java.desktop</addModule>
-                    <addModule>java.instrument</addModule>
-                    <addModule>java.security.jgss</addModule>
-                    <addModule>java.scripting</addModule> <!-- for gui -->
-                    <addModule>java.sql</addModule>
-                    <addModule>java.xml</addModule>
-                    <addModule>jdk.management.agent</addModule>
-                    <addModule>jdk.unsupported</addModule> <!-- for gui -->
-                    <addModule>jdk.zipfs</addModule>
-                    <addModule>jdk.jdwp.agent</addModule>
-                  </addModules>
-                  <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7/jdk-17.0.7+7/Contents/Home/jmods</modulePath>
-                  </modulePaths>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>build-jre-win32</id>
-      <!--
-          this profile needs to be run with JDK 17
-      -->
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jlink-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-cli</id> <!-- run directly from Makefile -->
-                <configuration>
-                  <classifier>win32</classifier>
-                  <addModules>
-                    <addModule>java.base</addModule>
-                    <addModule>java.desktop</addModule>
-                    <addModule>java.instrument</addModule>
-                    <addModule>java.sql</addModule>
-                    <addModule>java.xml</addModule>
-                    <addModule>jdk.management.agent</addModule>
-                    <addModule>jdk.zipfs</addModule>
-                    <addModule>jdk.jdwp.agent</addModule>s
-                  </addModules>
-                  <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
-                  </modulePaths>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>build-jre-win64</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jlink-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-cli</id> <!-- run directly from Makefile -->
-                <configuration>
-                  <classifier>win64</classifier>
-                  <addModules>
-                    <addModule>java.base</addModule>
-                    <addModule>java.desktop</addModule>
-                    <addModule>java.instrument</addModule>
-                    <addModule>java.sql</addModule>
-                    <addModule>java.xml</addModule>
-                    <addModule>jdk.management.agent</addModule>
-                    <addModule>jdk.zipfs</addModule>
-                    <addModule>jdk.jdwp.agent</addModule>
-                  </addModules>
-                  <modulePaths>
-                    <modulePath>src/main/jre/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7/jdk-17.0.7+7/jmods</modulePath>
-                  </modulePaths>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/build-jre.xml b/build-jre.xml
index fc8cbe75..763831c8 100644
--- a/build-jre.xml
+++ b/build-jre.xml
@@ -39,6 +39,23 @@
     </pluginManagement>
   </build>
   <profiles>
+    <profile>
+      <id>include-jdwp-agent</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-jlink-plugin</artifactId>
+              <configuration>
+                <addModules combine.children="append">
+                  <addModule>jdk.jdwp.agent</addModule>
+                </addModules>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
     <profile>
       <id>build-jre-linux</id>
       <!--