Add support for recent Java versions.

Reported by Emmanuel Bourg <ebourg@apache.org>
at <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892733>
via Santiago Vila.

* gettext-runtime/configure.ac: Require a Java compiler that supports
source-version 1.5 and target-version 1.6 (such as Java 6 or newer, or
GCJ 4.3 or newer).
* gettext-tools/src/write-java.c (msgdomain_write_java): Likewise
* gettext-tools/examples/hello-java-qtjambi/configure.ac: Likewise.
* gettext-tools/configure.ac: Require a Java compiler that supports
source-version 1.5 (such as Java 5 or newer, or GCJ 4.3 or newer).
* gettext-tools/examples/hello-java/configure.ac: Likewise.
* gettext-tools/examples/hello-java-awt/configure.ac: Likewise.
* gettext-tools/examples/hello-java-swing/configure.ac: Likewise.
* NEWS: Mention the change.

diff --git a/NEWS b/NEWS
index bb6c85d421dc573aa7abfc4c52c602e99f266395..7e59f2eaf8c8b9e29ff5246d9038e32a6db0daf1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,8 +14,11 @@
     xgettext now supports single-quotes in number tokens, as specified in
     C++14.
   - Java:
-    xgettext now supports UTF-8 encoded .properties files (a new feature
-    of Java 9).
+    o xgettext now supports UTF-8 encoded .properties files (a new feature
+      of Java 9).
+    o The build system and tools now support Java 9 and 10. On the other
+      hand, support for old versions of Java (Java 5 and older, GCJ 4.2.x
+      and older) has been dropped.
   - Perl:
     o Native support for context functions (pgettext, dpgettext, dcpgettext,
       npgettext, dnpgettext, dcnpgettext).

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 88d5c98f001afc866b4582f3e54fa066ef7fa5d7..beed677ca28a1a3a475d7f6969774c924fe4291b 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -35,7 +35,7 @@ AC_PROG_YACC
 
 gt_JAVA_CHOICE
 
-gt_JAVACOMP([1.3], [1.1])
+gt_JAVACOMP([1.5], [1.6])
 AC_CHECK_PROG([JAR], [jar], [jar])
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
   BUILDJAVA=yes

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index ca6934c21957ad2a0123e12fc43e08edd4a3d739..270e36d8fc9a0859cab84caa04477b88407bbbaa 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -36,7 +36,7 @@ AC_PROG_YACC
 gt_JAVA_CHOICE
 
 gt_JAVAEXEC
-gt_JAVACOMP([1.3])
+gt_JAVACOMP([1.5])
 AC_CHECK_PROG([JAR], [jar], [jar])
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
   BUILDJAVA=yes

diff --git a/gettext-tools/examples/hello-java-awt/configure.ac b/gettext-tools/examples/hello-java-awt/configure.ac
index dfb1a859a268f2f0fc0ee4f70c737f4e88b92c2a..9cbadfdd15c77741f3db3627b27b5cf777c5a4f4 100644 (file)
--- a/gettext-tools/examples/hello-java-awt/configure.ac
+++ b/gettext-tools/examples/hello-java-awt/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(hello-java-awt, 0)
 dnl Check whether we can execute Java programs.
 gt_JAVAEXEC([TestAWT], [$srcdir/m4])
 dnl Check whether we can build Java programs.
-gt_JAVACOMP([1.3])
+gt_JAVACOMP([1.5])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes

diff --git a/gettext-tools/examples/hello-java-qtjambi/configure.ac b/gettext-tools/examples/hello-java-qtjambi/configure.ac
index ca4a5ce49e63c6b1473ba709d53a9ac4b0f437eb..2a5c1f4f04cdb094c30d3d6ce7c79c2361bc27cf 100644 (file)
--- a/gettext-tools/examples/hello-java-qtjambi/configure.ac
+++ b/gettext-tools/examples/hello-java-qtjambi/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(hello-java-qtjambi, 0)
 dnl Check whether we can execute Java programs.
 gt_JAVAEXEC([Test15], [$srcdir/m4])
 dnl Check whether we can build Java programs.
-gt_JAVACOMP([1.5], [1.5])
+gt_JAVACOMP([1.5], [1.6])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes

diff --git a/gettext-tools/examples/hello-java-swing/configure.ac b/gettext-tools/examples/hello-java-swing/configure.ac
index 4d3295d370b755e4d3c94ba3e563b8a4af0d5816..fa9dd53481bab6600f49a885f86f23c25e1ad685 100644 (file)
--- a/gettext-tools/examples/hello-java-swing/configure.ac
+++ b/gettext-tools/examples/hello-java-swing/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(hello-java-swing, 0)
 dnl Check whether we can execute Java programs.
 gt_JAVAEXEC([TestAWT], [$srcdir/m4])
 dnl Check whether we can build Java programs.
-gt_JAVACOMP([1.3])
+gt_JAVACOMP([1.5])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes

diff --git a/gettext-tools/examples/hello-java/configure.ac b/gettext-tools/examples/hello-java/configure.ac
index 031c130990a66969794c3d5ddc6af179bcc4e5d0..29da82452f228343847eebc7b26e0c979e7f4f64 100644 (file)
--- a/gettext-tools/examples/hello-java/configure.ac
+++ b/gettext-tools/examples/hello-java/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(hello-java, 0)
 dnl Check whether we can execute Java programs.
 gt_JAVAEXEC
 dnl Check whether we can build Java programs.
-gt_JAVACOMP([1.3])
+gt_JAVACOMP([1.5])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes

diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index 9ddfac868aca76f7c954baf997c7fbb89f464159..942141c3c1993eb8e38a902450029590d575557f 100644 (file)
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -1,5 +1,5 @@
 /* Writing Java ResourceBundles.
-   Copyright (C) 2001-2003, 2005-2010, 2015-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010, 2015-2016, 2018 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -1208,7 +1208,7 @@ msgdomain_write_java (message_list_ty *mlp, const char *canon_encoding,
      Java compilers create the class files in the source file's directory -
      which is in a temporary directory in our case.  */
   java_sources[0] = java_file_name;
-  if (compile_java_class (java_sources, 1, NULL, 0, "1.3", "1.1", directory,
+  if (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
                           true, false, true, verbose > 0))
     {
       if (!verbose)