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

Use correct separator in Java class path under Windows.

Browse source 
A semicolon must be used there and not a colon as under Unix.
This commit is contained in:
Vadim Zeitlin 2015-07-27 17:17:16 +02:00
commit 658f92a993
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ LANGUAGE = java
JAVA = @JAVA@ JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAFLAGS = -Xcheck:jni JAVAFLAGS = -Xcheck:jni
JAVA_CLASSPATH_SEP := @JAVA_CLASSPATH_SEP@
SCRIPTSUFFIX = _runme.java SCRIPTSUFFIX = _runme.java
srcdir = @srcdir@ srcdir = @srcdir@
@ -96,7 +97,7 @@ setup = \
# Doxygen test cases need to be compiled together with the CommentsParser class # Doxygen test cases need to be compiled together with the CommentsParser class
# which depends on com.sun.javadoc package which is located in this JAR. # which depends on com.sun.javadoc package which is located in this JAR.
JAVA_CLASSPATH := . JAVA_CLASSPATH := .
$(DOXYGEN_TEST_CASES:=.cpptest): JAVA_CLASSPATH := "$(JAVA_HOME)/lib/tools.jar":. $(DOXYGEN_TEST_CASES:=.cpptest): JAVA_CLASSPATH := "$(JAVA_HOME)/lib/tools.jar$(JAVA_CLASSPATH_SEP)."
$(DOXYGEN_TEST_CASES:=.cpptest): DOXYGEN_COMMENT_PARSER := $(srcdir)/CommentParser.java $(DOXYGEN_TEST_CASES:=.cpptest): DOXYGEN_COMMENT_PARSER := $(srcdir)/CommentParser.java
# 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

11
configure.ac
View file

@ -1200,12 +1200,22 @@ case $host in
if test -n "$JAVA_HOME"; then if test -n "$JAVA_HOME"; then
JAVA_HOME=`cygpath --mixed "$JAVA_HOME"` JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
fi fi
dnl Java uses semicolons and not colons as separators in its classes search path under Windows.
JAVA_CLASSPATH_SEP=";"
;;
*-*-mingw*)
JAVA_CLASSPATH_SEP=";"
;; ;;
*-*-darwin*) *-*-darwin*)
dnl Under OS X JAVA_HOME is not set by default, try to set it to the default value. dnl Under OS X JAVA_HOME is not set by default, try to set it to the default value.
if test -z "$JAVA_HOME"; then if test -z "$JAVA_HOME"; then
JAVA_HOME=`/usr/libexec/java_home` JAVA_HOME=`/usr/libexec/java_home`
fi fi
JAVA_CLASSPATH_SEP=":"
;;
*)
dnl Assume generic Unix.
JAVA_CLASSPATH_SEP=":"
;; ;;
esac esac
@ -1344,6 +1354,7 @@ fi
AC_SUBST(JAVA) AC_SUBST(JAVA)
AC_SUBST(JAVAC) AC_SUBST(JAVAC)
AC_SUBST(JAVAINC) AC_SUBST(JAVAINC)
AC_SUBST(JAVA_CLASSPATH_SEP)
AC_SUBST(JAVADYNAMICLINKING) AC_SUBST(JAVADYNAMICLINKING)
AC_SUBST(JAVALIBRARYPREFIX) AC_SUBST(JAVALIBRARYPREFIX)
AC_SUBST(JAVASO) AC_SUBST(JAVASO)