From: Bruno Haible Date: Fri, 9 Jun 2023 14:08:18 +0000 (+0200) Subject: javacomp-script: Remove support for 'jikes'. X-Git-Tag: v1.0~1232 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=96afd2da4ef7a18e6ce1d3557daaf7dc65b5330d;p=gnulib.git javacomp-script: Remove support for 'jikes'. * build-aux/javacomp.sh.in: Don't test HAVE_JIKES. * m4/javacomp.m4 (gt_JAVACOMP): Don't set HAVE_JIKES. Don't set CONF_JAVAC to 'jikes'. Update comment. (gt_JAVACOMP_DISABLED): Don't set HAVE_JIKES. --- diff --git a/ChangeLog b/ChangeLog index de1b1eb08d..310927c36a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-06-09 Bruno Haible + + javacomp-script: Remove support for 'jikes'. + * build-aux/javacomp.sh.in: Don't test HAVE_JIKES. + * m4/javacomp.m4 (gt_JAVACOMP): Don't set HAVE_JIKES. Don't set + CONF_JAVAC to 'jikes'. Update comment. + (gt_JAVACOMP_DISABLED): Don't set HAVE_JIKES. + 2023-06-09 Bruno Haible javacomp: Remove support for 'gcj'. diff --git a/build-aux/javacomp.sh.in b/build-aux/javacomp.sh.in index 470dfd0e1a..d049c95ccf 100644 --- a/build-aux/javacomp.sh.in +++ b/build-aux/javacomp.sh.in @@ -48,20 +48,7 @@ else test -z "$JAVA_VERBOSE" || echo "$CONF_JAVAC $@" exec $CONF_JAVAC "$@" else - if test -n "@HAVE_JIKES@"; then - # In this case, $CONF_JAVAC starts with "jikes". - # Combine given CLASSPATH and configured CLASSPATH. - if test -n "$CLASSPATH"; then - CLASSPATH="$CLASSPATH${CONF_CLASSPATH:+@CLASSPATH_SEPARATOR@$CONF_CLASSPATH}" - else - CLASSPATH="$CONF_CLASSPATH" - fi - export CLASSPATH - test -z "$JAVA_VERBOSE" || echo "$CONF_JAVAC $@" - exec $CONF_JAVAC "$@" - else - echo 'Java compiler not found, try setting $JAVAC, then reconfigure' 1>&2 - exit 1 - fi + echo 'Java compiler not found, try setting $JAVAC, then reconfigure' 1>&2 + exit 1 fi fi diff --git a/m4/javacomp.m4 b/m4/javacomp.m4 index 32570a016d..d9e1608e0b 100644 --- a/m4/javacomp.m4 +++ b/m4/javacomp.m4 @@ -1,4 +1,4 @@ -# javacomp.m4 serial 22 +# javacomp.m4 serial 23 dnl Copyright (C) 2001-2003, 2006-2007, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -239,17 +239,9 @@ changequote([,])dnl dnl -target 9 only possible with -source 1.6/1.7/1.8/9 dnl -target 10 only possible with -source 1.6/1.7/1.8/9/10 dnl - dnl The support of jikes for target-version and source-version: - dnl - dnl jikes 1.14 does not have a way to specify the target-version. It - dnl always assumes target-version=1.1. - dnl - dnl For jikes 1.14, the source-version always is 1.3. - dnl CONF_JAVAC= HAVE_JAVAC_ENVVAR= HAVE_JAVAC= - HAVE_JIKES= HAVE_JAVACOMP= changequote(,)dnl cat > conftestlib.java </dev/null 2>/dev/null || test $? = 1; } \ - && ( - # See if the existing CLASSPATH is sufficient to make jikes work. - unset JAVA_HOME - jikes conftestlib.java >&AS_MESSAGE_LOG_FD 2>&1 - error=$? - rm -f conftestlib.class - exit $error - ); then - dnl OK, jikes works. - dnl Now test whether it supports the desired target-version and - dnl source-version. - if test "$source_version" = 1.3; then - CONF_JAVAC="jikes" - HAVE_JIKES=1 - HAVE_JAVACOMP=1 - fi - fi - fi fi rm -f conftest*.java conftest*.class if test -n "$HAVE_JAVACOMP"; then @@ -491,7 +461,6 @@ changequote([,])dnl AC_SUBST([CLASSPATH_SEPARATOR]) AC_SUBST([HAVE_JAVAC_ENVVAR]) AC_SUBST([HAVE_JAVAC]) - AC_SUBST([HAVE_JIKES]) ]) # Simulates gt_JAVACOMP when no Java support is desired. @@ -500,9 +469,7 @@ AC_DEFUN([gt_JAVACOMP_DISABLED], CONF_JAVAC= HAVE_JAVAC_ENVVAR= HAVE_JAVAC= - HAVE_JIKES= AC_SUBST([CONF_JAVAC]) AC_SUBST([HAVE_JAVAC_ENVVAR]) AC_SUBST([HAVE_JAVAC]) - AC_SUBST([HAVE_JIKES]) ])