From 834937cfbafb5ff11d95738c456bae254c957173 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 19 Sep 2013 08:36:07 +0200
Subject: 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.
---
 make/build.xml                           | 6 +++---
 make/scripts/check-java-major-version.sh | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index 2fe2d69..2d1ec43 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -726,9 +726,9 @@
            excludes="${gluegen.excludes.all} ${gluegen-rt.classes} ${java.part.android}"
            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}">
       <src path="${src.java}" />
       <src path="${src.generated.java}" />
diff --git a/make/scripts/check-java-major-version.sh b/make/scripts/check-java-major-version.sh
index 0e4424d..6b1711c 100755
--- a/make/scripts/check-java-major-version.sh
+++ b/make/scripts/check-java-major-version.sh
@@ -22,4 +22,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
 
-- 
cgit v1.2.3