jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JAVA_HOME nad tools.jar not needed for Java testing

Browse source 
tools.jar doesn't seem to be needed (in jdk9 anyway), so removing it.
This commit is contained in:
William S Fulton 2018-06-08 19:12:39 +01:00
commit 7373b99079
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/Manual/Doxygen.html
View file

@ -1714,9 +1714,7 @@ tool, for example:
<p> <p>
Runtime tests in Java are implemented using Javadoc doclets. To make that work, you Runtime tests in Java are implemented using Javadoc doclets in tools.jar in the JDK.
should have tools.jar from the JDK in your classpath. Or you should have JAVA_HOME
environment variable defined and pointing to the JDK location.
</p> </p>
<p> <p>
The Java's comment parsing code (the testing part) is located in commentParser.java. The Java's comment parsing code (the testing part) is located in commentParser.java.

6
Examples/test-suite/java/Makefile.in
View file

@ -6,10 +6,8 @@ LANGUAGE = java
JAVA = @JAVA@ JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAFLAGS = @JAVAFLAGS@ JAVAFLAGS = @JAVAFLAGS@
JAVA_CLASSPATH_SEP = @JAVA_CLASSPATH_SEP@
SCRIPTSUFFIX = _runme.java SCRIPTSUFFIX = _runme.java
JAVA_CLASSPATH = .
JAVA_HOME ?= @JAVA_HOME@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = ../@top_srcdir@ top_srcdir = ../@top_srcdir@
@ -110,8 +108,6 @@ CommentParser.class:
echo "Compiling $(srcdir)/CommentParser.java" echo "Compiling $(srcdir)/CommentParser.java"
$(COMPILETOOL) $(JAVAC) -classpath $(JAVA_CLASSPATH) -d . $(srcdir)/CommentParser.java $(COMPILETOOL) $(JAVAC) -classpath $(JAVA_CLASSPATH) -d . $(srcdir)/CommentParser.java
JAVA_CLASSPATH := .
$(DOXYGEN_TEST_CASES:=.cpptest): JAVA_CLASSPATH := "$(JAVA_HOME)/lib/tools.jar$(JAVA_CLASSPATH_SEP)."
$(DOXYGEN_TEST_CASES:=.cpptest): CommentParser.class $(DOXYGEN_TEST_CASES:=.cpptest): CommentParser.class
# Compiles java files then runs the testcase. A testcase is only run if # Compiles java files then runs the testcase. A testcase is only run if