[openoffice] branch javadetection created (now eecaf0d)

[tr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

truckman pushed a change to branch javadetection
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


      at eecaf0d  Set java compilation target to version 1.5

This branch includes the following new commits:

     new eecaf0d  Set java compilation target to version 1.5

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[openoffice] 01/01: Set java compilation target to version 1.5

[tr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch javadetection
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit eecaf0ddbbdbc51dd3249aaf1f92da8321f756fd
Author: Don Lewis <tr...@apache.org>
AuthorDate: Tue Sep 29 14:22:56 2020 -0700

    Set java compilation target to version 1.5
    
    Set java compilation target to version 1.5 so that old versions of java
    can be detected even when building using a newer version of the compiler.
---
 main/configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/configure.ac b/main/configure.ac
index 01981be..e8e130a 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3066,6 +3066,7 @@ you must use the "--with-jdk-home" configure option explicitly])
              AC_MSG_ERROR([JDK is too old, you need at least 1.5])
         fi
         AC_MSG_RESULT([checked (JDK $_jdk)])
+        JAVAFLAGS="-source -target 1.5"
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
         if test "$_os" = "WINNT"; then
           JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
@@ -3114,6 +3115,7 @@ if test "$SOLAR_JAVA" != ""; then
        fi
        JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
        JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
+       JAVAFLAGS="-source 1.5 -target 1.5"
     fi
     if test "$_os" = "OS2"; then
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then