The file tools.jar is no more on JDK since version 9, a file that

differentiate between a JDK or JRE install would be `java.base.jmod`. Freeform can run on JDK 8, add condition to set `nbjdk.home` to JDK 8 Co-authored-by: Matthias Bläsing <[email protected]>
DevCharly · Feb 9, 2024 · 8b6945a · 8b6945a
1 parent 2c6e3a7
commit 8b6945a
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">