diff options
| author | Sven Gothel <[email protected]> | 2013-09-19 09:20:03 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-09-19 09:20:03 +0200 |
| commit | b1db882abfe6166abb5f06df8ff2d386e5f8f842 (patch) | |
| tree | 17e5c0d9ae8659352f3d0e3ecbf1266a2d6747a7 | |
| parent | 5822557d00b43ee3655db4343eeefcd417094983 (diff) | |
Fix Bug 835: Use target.[sourcelevel,targetlevel,rt.jar] for all javac tasks.
Before we bumped java language version to 1.6, i.e. target == 1.5,
we required to compile some parts w/ the host level (1.6).
This is no more required.
| -rw-r--r-- | make/build-jogl.xml | 6 | ||||
| -rw-r--r-- | make/build-staticglgen.xml | 4 | ||||
| -rwxr-xr-x | make/scripts/check-java-major-version.sh | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 80df63765..e83f33603 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -796,9 +796,9 @@ includeAntRuntime="true" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" - source="${host.sourcelevel}" - target="${host.targetlevel}" - bootclasspath="${host.rt.jar}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="gluegen-gl.classpath"/> <src path="${src.java}" /> diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml index 6d1511058..8256fb00e 100644 --- a/make/build-staticglgen.xml +++ b/make/build-staticglgen.xml @@ -59,7 +59,9 @@ includeAntRuntime="true" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" - source="${host.sourcelevel}"> + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}"> <src path="${src.java}" /> <classpath refid="classpath" /> </javac> diff --git a/make/scripts/check-java-major-version.sh b/make/scripts/check-java-major-version.sh index 08e3bc7b5..86a2c2832 100755 --- a/make/scripts/check-java-major-version.sh +++ b/make/scripts/check-java-major-version.sh @@ -24,4 +24,8 @@ function do_it() { } do_it $1 2>&1 | tee check-java-major-version.log +echo +echo VERSIONS found: +echo +grep 'major version' check-java-major-version.log | sort -u |