diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-02-05 09:37:46 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2024-05-31 17:10:29 +0200 |
| commit | 389d5165bd86119f81f43684d3bd4958d072a396 (patch) | |
| tree | c760a69c0942029ce661d08b3cc741ef58022df0 | |
| parent | 3b32b91edebc76e4417b086acb6a0486a7fe80c0 (diff) | |
Always set java bytecode / source target to 1.6 / 6
as our new baseline (as discussed in ESC call 2019-02-07)
Change-Id: I8a22fab6a1f9a713cb55b4c5d8173c3bbcd28587
Reviewed-on: https://gerrit.libreoffice.org/67387
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 204c5d1746c0afc145f9b54b68c4a099f9f0e2bf)
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 05ecb1bae5e3..71022b841c46 100644 --- a/configure.ac +++ b/configure.ac @@ -6933,7 +6933,6 @@ if test "$ENABLE_JAVA" != ""; then fi fi -HAVE_JAVA9= dnl =================================================================== dnl Checks for JDK. dnl =================================================================== @@ -6985,9 +6984,6 @@ you must use the "--with-jdk-home" configure option explicitly]) if test "$_jdk_ver" -gt 10600; then JAVA_CLASSPATH_NOT_SET=TRUE fi - if test "$_jdk_ver" -ge 10900; then - HAVE_JAVA9=TRUE - fi AC_MSG_RESULT([checked (JDK $_jdk)]) JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` @@ -7010,23 +7006,12 @@ else fi dnl =================================================================== -dnl Set target Java bytecode version -dnl =================================================================== -if test "$ENABLE_JAVA" != ""; then - if test "$HAVE_JAVA9" = "TRUE"; then - _java_target_ver="1.6" - else - _java_target_ver="1.5" - fi - JAVA_SOURCE_VER="$_java_target_ver" - JAVA_TARGET_VER="$_java_target_ver" -fi - -dnl =================================================================== dnl Checks for javac dnl =================================================================== if test "$ENABLE_JAVA" != ""; then javacompiler="javac" + JAVA_SOURCE_VER="1.6" + JAVA_TARGET_VER="1.6" if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVACOMPILER, $javacompiler) else |