openrs2
/
jode
0
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

check for cygpath and give java a correct classpath under windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1126 379699f6-c40d-0410-875b-85095c16579e
branch_1_1
jochen 26 years ago
parent 17986f6c3f
commit 6fea2e3540
10 changed files with 32 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      jode/configure.in
  2. 6
      jode/jode/Makefile.am
  3. 3
      jode/jode/decompiler/Makefile.am
  4. 3
      jode/jode/expr/Makefile.am
  5. 3
      jode/jode/flow/Makefile.am
  6. 5
      jode/jode/jvm/Makefile.am
  7. 3
      jode/jode/obfuscator/Makefile.am
  8. 3
      jode/jode/swingui/Makefile.am
  9. 3
      jode/jode/type/Makefile.am
  10. 3
      jode/jode/util/Makefile.am

11
jode/configure.in
Unescape View File

@ -15,6 +15,7 @@ dnl AC_PROG_RANLIB
dnl AC_PATH_PROG(ZIP, zip) dnl AC_PATH_PROG(ZIP, zip)
AC_PATH_PROG(UNZIP, unzip) AC_PATH_PROG(UNZIP, unzip)
AC_PATH_PROG(PERL, perl) AC_PATH_PROG(PERL, perl)
AC_PATH_PROG(CYGPATH, cygpath)
dnl Checks for libraries. dnl Checks for libraries.
@ -30,6 +31,16 @@ AC_SUBST(QUOTE)
AC_SUBST(SHELL) 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, AC_ARG_WITH(java,
[ --with-java specify path to a java-like program ], [ --with-java specify path to a java-like program ],
[ [

6
jode/jode/Makefile.am
Unescape View File

@ -8,7 +8,8 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):.:$(CLASSPATH):$(CLASSLIB) SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
AssertError.java \ AssertError.java \
@ -27,7 +28,8 @@ JARFILE = jode-@VERSION@.jar
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/decompiler/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -32,7 +33,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/expr/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -58,7 +59,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/flow/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -56,7 +57,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

5
jode/jode/jvm/Makefile.am
Unescape View File

@ -6,7 +6,8 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
BUILD_CLASSPATH = $(top_builddir):$(top_srcdir):$(CLASSPATH):$(CLASSLIB) SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
CodeVerifier.java \ CodeVerifier.java \
@ -25,7 +26,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/obfuscator/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -44,7 +45,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/swingui/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -18,7 +19,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/type/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -24,7 +25,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

3
jode/jode/util/Makefile.am
Unescape View File

@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
-dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir) -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
CLASSPATH = @CLASSPATH@ CLASSPATH = @CLASSPATH@
CLASSLIB = @CLASSLIB@ CLASSLIB = @CLASSLIB@
SUBSTCP = @SUBSTCP@
BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB) BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
MY_JAVA_FILES = \ MY_JAVA_FILES = \
@ -20,7 +21,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
%.class: %.java %.class: %.java
$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $< $(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
%.dep: %.class %.dep: %.class
$(JAVADEP) $< >$@ $(JAVADEP) $< >$@

Write Preview
Loading…
Cancel
Save