From 23019bb5899acddca17d1d951798d1c70d2d1f09 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 22 Jan 2012 23:38:38 +0100
Subject: Fix Bug 516 (Determine Java Version) / See gluegen:
 64639b805a32338385421f168e12c1ef7f749d00

---
 build.xml                             | 17 ++++++++++++++---
 nbproject/project.properties          |  4 ----
 scripts/make.jocl.all.linux-x86_64.sh |  7 +++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 300ae362..c4ae5b33 100644
--- a/build.xml
+++ b/build.xml
@@ -34,8 +34,11 @@
         <isset property="c.dont.compile"/>
     </condition>
     
-    <target name="-pre-init" depends="gluegen.cpptasks.detect.os">
-        <!-- gluegen.cpptasks... sets jvmDataModel.arg -->
+    <target name="-pre-init" depends="jogamp.env.init,gluegen.cpptasks.detect.os">
+        <property name="javac.debug" value="${javacdebug}"/>
+        <property name="javac.source" value="${target.sourcelevel}"/>
+        <property name="javac.target" value="${target.targetlevel}"/>
+        <property name="javac.compilerargs" value="-bootclasspath ${target.rt.jar} -Xlint -g:${javacdebuglevel}"/>
     </target>
 
     <!-- -post-init is after all properties are imported -->
@@ -247,7 +250,15 @@
         <!--compile build utilities-->
         <mkdir dir="${etc.build.dir}"/>
 
-        <javac destdir="${etc.build.dir}" classpath="${ant.core.lib}" source="1.5" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
+        <javac destdir="${etc.build.dir}" 
+               classpath="${ant.core.lib}" 
+               fork="yes"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${basedir}/etc/src"/>
         </javac>
 
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6dada473..f446db9b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -43,11 +43,7 @@ jar.compress=false
 javac.classpath=\
     ${file.reference.gluegen-rt.jar}:\
     ${file.reference.jogl.all.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint
 javac.deprecation=true
-javac.source=1.5
-javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh
index 680d1454..b47e8b57 100644
--- a/scripts/make.jocl.all.linux-x86_64.sh
+++ b/scripts/make.jocl.all.linux-x86_64.sh
@@ -6,6 +6,13 @@ if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
+#    -Dtarget.sourcelevel=1.6 \
+#    -Dtarget.targetlevel=1.6 \
+#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+
 ant  \
+    -Dtarget.sourcelevel=1.6 \
+    -Dtarget.targetlevel=1.6 \
+    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
     -Drootrel.build=build-x86_64 \
     $* 2>&1 | tee make.jocl.all.linux-x86_64.log
-- 
cgit v1.2.3