diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-02-05 09:37:46 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-02-12 13:54:14 +0100 |
| commit | 204c5d1746c0afc145f9b54b68c4a099f9f0e2bf (patch) | |
| tree | 2a65073eb93b11759a56d45d4a837fc7b25ac612 /configure.ac | |
| parent | loplugin:flatten in sdext (diff) | |
| download | core-204c5d1746c0afc145f9b54b68c4a099f9f0e2bf.tar.gz core-204c5d1746c0afc145f9b54b68c4a099f9f0e2bf.zip | |
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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 4881270656da..290288d7d56e 100644 --- a/configure.ac +++ b/configure.ac @@ -7097,7 +7097,6 @@ if test "$ENABLE_JAVA" != ""; then fi fi -HAVE_JAVA9= dnl =================================================================== dnl Checks for JDK. dnl =================================================================== @@ -7149,9 +7148,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"` @@ -7174,23 +7170,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 |