Fix Bug 751 OSX Java-6: Derive host/target-rt jar file from 'java.home'.

3 files changed, 31 insertions, 12 deletions

diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
index 542d288..b7fcd21 100755
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -163,17 +163,17 @@
 
     <property name="target.sourcelevel"       value="${ant.java.version}" />      <!-- default fallback values -->
     <property name="target.targetlevel"       value="${ant.java.version}" />      <!-- default fallback values -->
-    <!-- default value for std Java -->
+    <!-- Default value for std Java (incl. Java7 on OS X) -->
     <condition property="target.rt.jar"
                value="${java.home}/lib/rt.jar">
                <available file="${java.home}/lib/rt.jar"/>
     </condition>
-    <!-- default fallback value on OS X -->
+    <!-- Default fallback value for Java6 OS X -->
     <condition property="target.rt.jar"
-               value="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar">
-               <available file="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"/>
+               value="${java.home}/../Classes/classes.jar">
+               <available file="${java.home}/../Classes/classes.jar"/>
     </condition>
-    <!-- default fallback value on std Java -->
+    <!-- Default fallback value on std Java -->
     <echo message="target.user.set            ${target.user.set}"/>
     <echo message="target.sourcelevel         ${target.sourcelevel}"/>
     <echo message="target.targetlevel         ${target.targetlevel}"/>
@@ -188,15 +188,15 @@
 
     <property name="host.sourcelevel"         value="${ant.java.version}" />      <!-- default values for compile time components -->
     <property name="host.targetlevel"         value="${ant.java.version}" />      <!-- default values for compile time components -->
-    <!-- default value for std Java -->
+    <!-- Default value for std Java (incl. Java7 on OS X) -->
     <condition property="host.rt.jar"
                value="${java.home}/lib/rt.jar">
                <available file="${java.home}/lib/rt.jar"/>
     </condition>
-    <!-- default fallback value on OS X -->
+    <!-- Default fallback value for Java6 OS X -->
     <condition property="host.rt.jar"
-               value="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar">
-               <available file="/System/Library/Frameworks/JavaVM.framework/Versions/${ant.java.version}/Classes/classes.jar"/>
+               value="${java.home}/../Classes/classes.jar">
+               <available file="${java.home}/../Classes/classes.jar"/>
     </condition>
     <echo message="host.sourcelevel           ${host.sourcelevel}"/>
     <echo message="host.targetlevel           ${host.targetlevel}"/>
diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java7.sh
index 1a69f9e..f88341b 100755
--- a/make/scripts/make.gluegen.all.macosx-java7.sh
+++ b/make/scripts/make.gluegen.all.macosx-java7.sh
@@ -15,8 +15,5 @@ PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
 ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
     -Drootrel.build=build-macosx-java7 \
     $* 2>&1 | tee make.gluegen.all.macosx-java7.log
diff --git a/make/scripts/make.gluegen.all.macosx-java7_target16.sh b/make/scripts/make.gluegen.all.macosx-java7_target16.sh
new file mode 100755
index 0000000..4e9e04a
--- /dev/null
+++ b/make/scripts/make.gluegen.all.macosx-java7_target16.sh
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+if [ -e /opt-share/etc/profile.ant ] ; then
+    . /opt-share/etc/profile.ant
+fi
+
+#    -Dc.compiler.debug=true 
+#
+#    -Dtarget.sourcelevel=1.6 \
+#    -Dtarget.targetlevel=1.6 \
+#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+
+JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+PATH=$JAVA_HOME/bin:$PATH
+export JAVA_HOME PATH
+
+ant \
+    -Dtarget.sourcelevel=1.6 \
+    -Dtarget.targetlevel=1.6 \
+    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+    -Drootrel.build=build-macosx-java7_target16 \
+    $* 2>&1 | tee make.gluegen.all.macosx-java7_target16.log