Merge pull request apache#7031 from pepness/jdk-xml

Fix how to define fallback values for a jdk installation in some xml files, including JDK 8 support for Freeform projects.
jtulach · Feb 10, 2024 · f586ed1 · f586ed1
2 parents e75fdec + 8b6945a
commit f586ed1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/java/java.freeform/src/org/netbeans/modules/java/freeform/jdkselection/jdk.xml b/java/java.freeform/src/org/netbeans/modules/java/freeform/jdkselection/jdk.xml
@@ -161,6 +161,9 @@
         <condition property="nbjdk.home" value="${java.home.parent}">
             <available file="${java.home.parent}/lib/tools.jar" type="file"/>
         </condition>
+        <condition property="nbjdk.home" value="${java.home}">
+            <available file="${java.home}/jmods/java.base.jmod" type="file"/>
+        </condition>
         <condition property="nbjdk.home" value="${java.home}">
             <available file="${java.home}/lib/tools.jar" type="file"/>
         </condition>

diff --git a/nbbuild/jdk.xml b/nbbuild/jdk.xml
@@ -210,10 +210,10 @@
         <!-- Define fallback values of some things. -->
         <property name="java.home.parent" location="${java.home}/.."/>
         <condition property="nbjdk.home" value="${java.home.parent}">
-            <available file="${java.home.parent}/lib/tools.jar" type="file"/>
+            <available file="${java.home.parent}/jmods/java.base.jmod" type="file"/>
         </condition>
         <condition property="nbjdk.home" value="${java.home}">
-            <available file="${java.home}/lib/tools.jar" type="file"/>
+            <available file="${java.home}/jmods/java.base.jmod" type="file"/>
         </condition>
 
         <!-- Mac OS X -->

diff --git a/nbbuild/nbproject/jdk.xml b/nbbuild/nbproject/jdk.xml
@@ -159,10 +159,10 @@
 
         <property name="java.home.parent" location="${java.home}/.."/>
         <condition property="nbjdk.home" value="${java.home.parent}">
-            <available file="${java.home.parent}/lib/tools.jar" type="file"/>
+            <available file="${java.home.parent}/jmods/java.base.jmod" type="file"/>
         </condition>
         <condition property="nbjdk.home" value="${java.home}">
-            <available file="${java.home}/lib/tools.jar" type="file"/>
+            <available file="${java.home}/jmods/java.base.jmod" type="file"/>
         </condition>
 
         <condition property="nbjdk.home" value="/Library/Java/Home">