Fixed java.home directory and removed obsolete tools.jar

In Java 9+, there's no longer a "jre" directory in the installation, so
removed references to it. The tools.jar file also no longer exists in
Java installations (it's now stored in a secret non-JAR format), so
removed that as well.

5 files changed, 21 insertions, 33 deletions

diff --git a/make/build.xml b/make/build.xml
index 3304ec4..73616fa 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -138,8 +138,6 @@
     <property name="c.grammar.out.dir" value="${src.generated.java}/com/jogamp/gluegen/cgram" />
     <property name="j.grammar.out.dir" value="${src.generated.java}/com/jogamp/gluegen/jgram" />
 
-    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
-
     <property name="archive.name"     value="gluegen-${gluegen.version}-${os.and.arch}" />
     <property name="archive"          value="${build}/${archive.name}" />
 
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 7aee9c9..83e80cb 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1008,22 +1008,13 @@
 
     <!-- ================================================================== -->
     <!-- 
-       - Set up java.home.dir appropriately on all platforms.
+       - Set up java.home.dir appropriately on all platforms. Used to differ
+       - across platforms, and used to be the directory above java.home,
+       - but is now the same in JDK 9 and later since there is no more '<java-install-dir>/jre'
+       - directory and the directory layout is the same across platforms.
       -->
-  <target name="setup.java.home.dir.nonmacosx" unless="isOSX">
-      <!-- java home dir is up one directory as java.home points to '<java-install-dir>/jre' -->
-      <property name="java.home.dir" value="${java.home}/.." />
-  </target>
-  <target name="setup.java.home.dir.macosx" if="isOSX">
-      <!-- Java7 std location -->
-      <condition property="java.home.dir"
-                 value="${java.home}/..">
-                 <available file="${java.home}/../include/jni.h"/>
-      </condition>
-      <!-- Fallback value Java6 -->
-      <property name="java.home.dir" value="/System/Library/Frameworks/JavaVM.framework/Home" />
-  </target>
-  <target name="setup.java.home.dir" depends="setup.java.home.dir.nonmacosx,setup.java.home.dir.macosx">
+  <target name="setup.java.home.dir">
+      <property name="java.home.dir" value="${java.home}" />
       <property name="java.includes.dir" value="${gluegen.root.abs-path}/make/stub_includes/jni" />
       <echo message="java.home.dir      ${java.home.dir}" />
       <echo message="java.includes.dir  ${java.includes.dir}" />
@@ -1579,7 +1570,7 @@
       <echo message="Win64.MingW" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.win64.mingw" />
       <property name="linker.cfg.id.base"            value="linker.cfg.win64.mingw" />
-      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/bin" /> <!-- link against dll directly (not lib)-->
+      <property name="java.lib.dir.platform"         value="${java.home.dir}/bin" /> <!-- link against dll directly (not lib)-->
     </target>
 
     <target name="gluegen.cpptasks.declare.compiler.win32" depends="gluegen.cpptasks.declare.compiler.win32.vc6,gluegen.cpptasks.declare.compiler.win32.vc7,gluegen.cpptasks.declare.compiler.win32.vc8,gluegen.cpptasks.declare.compiler.win32.vc8_x64,gluegen.cpptasks.declare.compiler.win32.vc9,gluegen.cpptasks.declare.compiler.win32.mingw,gluegen.cpptasks.declare.compiler.win64.mingw" if="isWindows">
@@ -1725,8 +1716,8 @@
       <property name="linker.cfg.id.base"            value="linker.cfg.macosx" /> 
       <property name="java.includes.dir.platform"    value="${java.includes.dir}/macosx" />
       <condition property="java.lib.dir.platform"
-                 value="${java.home.dir}/jre/lib">
-                 <available file="${java.home.dir}/jre/lib/libjawt.dylib"/>
+                 value="${java.home.dir}/lib">
+                 <available file="${java.home.dir}/lib/libjawt.dylib"/>
       </condition>
       <!-- Fallback value Java6 -->
       <property name="java.lib.dir.platform"      value="/System/Library/Frameworks/JavaVM.framework/Libraries" />
diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
index 7f1c61b..064cbe5 100644
--- a/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -5,21 +5,21 @@
     <target name="compile-test">
         <mkdir dir="build/test/build/classes"/>
         <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" failonerror="false" source="1.5" srcdir="test/junit">
-            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit.jar:${ant.core.lib}"/>
         </javac>
     </target>
     <target name="compile-selected-files-in-junit">
         <fail unless="files">Must set property 'files'</fail>
         <mkdir dir="build/test/build/classes"/>
         <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" includes="${files}" source="1.5" srcdir="test/junit">
-            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit.jar:${ant.core.lib}"/>
         </javac>
     </target>
     <target depends="compile-test" name="run-selected-file-in-junit">
         <fail unless="run.class">Must set property 'run.class'</fail>
         <java classname="${run.class}" failonerror="true" fork="true">
             <classpath>
-                <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+                <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${ant.core.lib}"/>
             </classpath>
         </java>
     </target>
@@ -29,7 +29,7 @@
             <test name="${run.class}"/>
             <jvmarg value="-Djava.library.path=${basedir}/build/test/build/natives:${basedir}/build/obj"/>
             <classpath>
-                <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+                <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${ant.core.lib}"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
         </junit>
@@ -37,7 +37,7 @@
     <target depends="compile-test" name="debug-selected-file-in-junit">
         <fail unless="run.class">Must set property 'debug.class'</fail>
         <path id="cp">
-            <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${ant.core.lib}"/>
         </path>
         <nbjpdastart addressproperty="jpda.address" name="GlueGen" transport="dt_socket">
             <classpath refid="cp"/>
@@ -57,7 +57,7 @@
         <fail unless="run.class">Must set property 'run.class'</fail>
         <java classname="${run.class}" failonerror="true" fork="true">
             <classpath>
-                <pathelement path="build/classes:${jdk.home}/lib/tools.jar:/lib/antlr-3.2.jar"/>
+                <pathelement path="build/classes:/lib/antlr-3.2.jar"/>
                 <pathelement location="build/classes"/>
             </classpath>
         </java>
@@ -68,7 +68,7 @@
         <fail unless="files">Must set property 'files'</fail>
         <mkdir dir="build/classes"/>
         <javac destdir="build/classes" includes="${files}" source="1.5" srcdir="src/java">
-            <classpath path="build/classes:${jdk.home}/lib/tools.jar:${ant.core.lib}:lib/antlr-3.2.jar"/>
+            <classpath path="build/classes:${ant.core.lib}:lib/antlr-3.2.jar"/>
         </javac>
     </target>
 </project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 654f87f..8e3a87b 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -224,20 +224,20 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src/java</package-root>
-                <classpath mode="compile">build/classes:${jdk.home}/lib/tools.jar:/usr/share/ant/lib/ant.jar:/home/mbien/netbeans68/java3/ant/lib/ant.jar:make/lib/antlr.jar</classpath>
+                <classpath mode="compile">build/classes:/usr/share/ant/lib/ant.jar:/home/mbien/netbeans68/java3/ant/lib/ant.jar:make/lib/antlr.jar</classpath>
                 <built-to>build/classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>build/gensrc/java</package-root>
-                <classpath mode="compile">build/classes:make/lib/antlr.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}</classpath>
+                <classpath mode="compile">build/classes:make/lib/antlr.jar:${ant.core.lib}</classpath>
                 <built-to>build/classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>test/junit</package-root>
                 <unit-tests/>
-                <classpath mode="compile">build/classes:build/test/build/classes:make/lib/antlr.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
+                <classpath mode="compile">build/classes:build/test/build/classes:make/lib/antlr.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
                 <built-to>build/classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
@@ -253,7 +253,7 @@
             <compilation-unit>
                 <package-root>src/junit</package-root>
                 <unit-tests/>
-                <classpath mode="compile">build/classes:build/test/build/classes:make/lib/antlr.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
+                <classpath mode="compile">build/classes:build/test/build/classes:make/lib/antlr.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
diff --git a/test/junit/com/jogamp/gluegen/build.xml b/test/junit/com/jogamp/gluegen/build.xml
index 95617be..3555df1 100644
--- a/test/junit/com/jogamp/gluegen/build.xml
+++ b/test/junit/com/jogamp/gluegen/build.xml
@@ -22,7 +22,6 @@
         <echo message=" - - - compiling java files - - - "/>
 
         <property name="build.dir.java" value="${build.dir}/classes"/>
-        <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
 
         <echo message="src: ${src.dir} "/>
         <echo message="build: ${build.dir.java} "/>
@@ -31,7 +30,7 @@
 
         <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" debuglevel="lines,vars,source">
             <src path="${src.dir}"/>
-            <classpath path="${gluegen.root}/${rootrel.build}/classes:${src.dir}:${gluegen.root}/${rootrel.build}/antlr-3.2.jar:${gluegen.root}/make/lib/junit.jar:${tools.jar}:${ant.core.lib}"/>
+            <classpath path="${gluegen.root}/${rootrel.build}/classes:${src.dir}:${gluegen.root}/${rootrel.build}/antlr-3.2.jar:${gluegen.root}/make/lib/junit.jar:${ant.core.lib}"/>
         </javac>
 
         <echo message=" - - - java files compiled - - - "/>