check for cygpath and give java a correct classpath under windows

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1126 379699f6-c40d-0410-875b-85095c16579e
25 years ago · 6fea2e3540
parent 17986f6c3f
commit 6fea2e3540
10 changed files with 32 additions and 11 deletions
--- a/jode/configure.in
+++ b/jode/configure.in
@ -15,6 +15,7 @@ dnl AC_PROG_RANLIB
 dnl AC_PATH_PROG(ZIP, zip)
 AC_PATH_PROG(UNZIP, unzip)
 AC_PATH_PROG(PERL, perl)
+AC_PATH_PROG(CYGPATH, cygpath)

 dnl Checks for libraries.

@ -30,6 +31,16 @@ AC_SUBST(QUOTE)

 AC_SUBST(SHELL)

+if test -n "$CYGPATH"; then
+  # Extra check if java take windows path?
+  CLASSPATH=`$CYGPATH --unix --path $CLASSPATH`
+  SUBSTCP="$CYGPATH --windows --path"
+else
+  SUBSTCP="echo"
+fi
+
+AC_SUBST(SUBSTCP)
+
 AC_ARG_WITH(java,
  [  --with-java		  specify path to a java-like program ],
  [
--- a/jode/jode/Makefile.am
+++ b/jode/jode/Makefile.am
@ -8,7 +8,8 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
-BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):.:$(CLASSPATH):$(CLASSLIB)
+SUBSTCP = @SUBSTCP@
+BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
  AssertError.java \
@ -27,7 +28,8 @@ JARFILE = jode-@VERSION@.jar
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
+
 %.dep: %.class
 	$(JAVADEP) $< >$@

--- a/jode/jode/decompiler/Makefile.am
+++ b/jode/jode/decompiler/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -32,7 +33,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/expr/Makefile.am
+++ b/jode/jode/expr/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -58,7 +59,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/flow/Makefile.am
+++ b/jode/jode/flow/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -56,7 +57,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/jvm/Makefile.am
+++ b/jode/jode/jvm/Makefile.am
@ -6,7 +6,8 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
-BUILD_CLASSPATH = $(top_builddir):$(top_srcdir):$(CLASSPATH):$(CLASSLIB)
+SUBSTCP = @SUBSTCP@
+BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
  CodeVerifier.java \
@ -25,7 +26,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/obfuscator/Makefile.am
+++ b/jode/jode/obfuscator/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -44,7 +45,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/swingui/Makefile.am
+++ b/jode/jode/swingui/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -18,7 +19,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/type/Makefile.am
+++ b/jode/jode/type/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -24,7 +25,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@
--- a/jode/jode/util/Makefile.am
+++ b/jode/jode/util/Makefile.am
@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
   -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)

 MY_JAVA_FILES = \
@ -20,7 +21,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<

 %.dep: %.class
 	$(JAVADEP) $< >$@