summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2012-01-22 23:42:55 +0100
committerSven Gothel <sgothel@jausoft.com>2012-01-22 23:42:55 +0100
commit86540a113a4d304a1b8ed0af6149ea938e486e7a (patch)
treec6bb6659bed6a24654f120e17dd1a2245ac401aa
parent28a22e1007a5d5e418177e7f79b17e606d02d3b1 (diff)
Fix Bug 516 (Determine Java Version) / See gluegen: 64639b805a32338385421f168e12c1ef7f749d00v2.0-rc9v2.0-rc8v2.0-rc7v2.0-rc6
-rw-r--r--build.xml7
-rw-r--r--nbproject/project.properties3
-rw-r--r--scripts/make.jogl.all.linux-x86_64.sh7
3 files changed, 14 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index c17a573..3023166 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,13 @@
<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"/>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index ed2759c..130d0bf 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -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}:\
diff --git a/scripts/make.jogl.all.linux-x86_64.sh b/scripts/make.jogl.all.linux-x86_64.sh
index b082a65..d3cb547 100644
--- a/scripts/make.jogl.all.linux-x86_64.sh
+++ b/scripts/make.jogl.all.linux-x86_64.sh
@@ -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