diff options
| author | Vadim Zeitlin <vz-swig@zeitlins.org> | 2019-12-18 02:42:12 +0100 |
|---|---|---|
| committer | Vadim Zeitlin <vz-swig@zeitlins.org> | 2019-12-18 02:45:06 +0100 |
| commit | 66a78261924174791a4952d05b58d52c16a36a57 (patch) | |
| tree | 7275fa16d835f37a55094edd2fb11fefbd291e2d /configure.ac | |
| parent | 5a8875ca9da7046b2b3b7fea3f1e056f289c5be1 (diff) | |
| download | swig-66a78261924174791a4952d05b58d52c16a36a57.tar.gz | |
Rewrite Doxygen unit tests for Java using Java 9 API
In particular, do not use com.sun.javadoc deprecated since Java 9 and
finally removed in Java 13, to allow the tests to run under modern JRE.
They don't run under Java 8 and earlier any more, but this shouldn't be
a huge problem nowadays and as SWIG output is independent from the Java
version used, it's enough to test it with modern Java versions.
Note that the tests themselves were changed only in the most minimal
way, to adapt them to the new way of running javadoc (which is now also
integrated into CommentParser itself instead of being duplicated in
every test).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index ea469c24e..809a216e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1408,15 +1408,6 @@ if test -z "$JAVA_HOME" && test -n "$JAVA_HOME_MAYBE" ; then fi fi -# Javadoc support required for the Java test-suite is available by default in jdk9+ and in tools.jar in earlier jdk versions -AC_MSG_CHECKING(for java tools.jar) -if test -n "$JAVA_HOME" && test -r "$JAVA_HOME/lib/tools.jar" ; then - JAVA_TOOLS_JAR="$JAVA_HOME/lib/tools.jar" - AC_MSG_RESULT([$JAVA_TOOLS_JAR]) -else - AC_MSG_RESULT(not found) -fi - case $host in *-*-cygwin*) # TODO: Only use this flag if the compiler supports it, later versions of gcc no longer have it @@ -1483,7 +1474,6 @@ AC_SUBST(JAVA) AC_SUBST(JAVAC) AC_SUBST(JAVAINC) AC_SUBST(JAVA_CLASSPATH_SEP) -AC_SUBST(JAVA_TOOLS_JAR) AC_SUBST(JAVADYNAMICLINKING) AC_SUBST(JAVALIBRARYPREFIX) AC_SUBST(JAVASO) |