Jogamp
Fix Bug 516 (Determine Java Version) / See gluegen: 64639b805a32338385421f168e12c1ef7... v2.0-rc6 v2.0-rc7 v2.0-rc8 v2.0-rc9
authorSven Gothel <sgothel@jausoft.com>
Sun, 22 Jan 2012 22:42:55 +0000 (23:42 +0100)
committerSven Gothel <sgothel@jausoft.com>
Sun, 22 Jan 2012 22:42:55 +0000 (23:42 +0100)
build.xml
nbproject/project.properties
scripts/make.jogl.all.linux-x86_64.sh

index c17a573..3023166 100644 (file)
--- a/build.xml
+++ b/build.xml
     <import file="${gluegen.root}/make/jogamp-env.xml" />
     <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
 
+    <target name="-pre-init" depends="jogamp.env.init">
+        <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>
+
     <target name="-pre-jar" depends="jogamp.env.init">
         <tstamp>
             <format property="version.timestamp" pattern="yyyyMMdd"/>
index ed2759c..130d0bf 100644 (file)
@@ -41,10 +41,7 @@ javac.classpath=\
     ${file.reference.jogl.all.jar}:\
     ${file.reference.gluegen-rt.jar}
 # Space-separated list of extra javac options
-javac.compilerargs=
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
index b082a65..d3cb547 100644 (file)
@@ -4,6 +4,13 @@ if [ -e ../setenv-build-jogl-x86_64.sh ] ; then
     . ../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.jogl.all.linux-x86_64.log
http://JogAmp.org git info: FAQ, tutorial and man pages.