make dependencies more relative

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1089 379699f6-c40d-0410-875b-85095c16579e
branch_1_1
jochen 26 years ago
parent d524b1f2a8
commit f7be2d00d5
  1. 28
      jode/javaDependencies.pl.in
  2. 4
      jode/jode/Makefile.am
  3. 2
      jode/jode/bytecode/Makefile.am
  4. 2
      jode/jode/decompiler/Makefile.am
  5. 2
      jode/jode/expr/Makefile.am
  6. 2
      jode/jode/flow/Makefile.am
  7. 2
      jode/jode/jvm/Makefile.am
  8. 5
      jode/jode/obfuscator/Makefile.am
  9. 2
      jode/jode/swingui/Makefile.am
  10. 2
      jode/jode/type/Makefile.am
  11. 2
      jode/jode/util/Makefile.am

@ -27,12 +27,15 @@
# constant and thus doesn't include a reference to the class. # constant and thus doesn't include a reference to the class.
# #
# Usage: # Usage:
# javaDependencies.pl -classpath <cp> [-dependdir <depdir>] <classfile> # javaDependencies.pl -classpath <cp> [-dependdir <depdir> [-subdir <subdir>]]
# <classfile>
# #
# cp: colon separated paths to the java files we should depend on. # cp: colon separated paths to the java files we should depend on.
# depdir: if set, use this path as path to the java files when printing # depdir: if set, use this path as path to the java files when printing
# dependencies, not the path where the java files were found. # dependencies, not the path where the java files were found.
# useful, if you want to make use of VPATH settings in Makefile. # useful, if you want to make use of VPATH settings in Makefile.
# subdir: if set, this is the path from depdir to the current directory.
# Use it to remove unneccessary ../../$subdir/
# class: The class file (not an inner class) for which the dependencies # class: The class file (not an inner class) for which the dependencies
# should be generated. We will also look for inner and anon # should be generated. We will also look for inner and anon
# classes. # classes.
@ -136,11 +139,28 @@ for $filename ($clazz, glob("$base\\\$*.class")) {
next if defined $done{"$clzz"}; next if defined $done{"$clzz"};
$done{$clzz} = 1; $done{$clzz} = 1;
my $p;
for $p (split ':', $classpath) { for $p (split ':', $classpath) {
if (-e "$p/$clzz.java") { if (-e "$p/$clzz.java") {
push @deplist, (defined $dependdir my $path="$p/";
? "$dependdir/$clzz.java" if (defined $dependdir) {
: "$p/$clzz.java"); $path = "$dependdir/";
if (defined $subdir) {
my $currsubdir = "$subdir/";
while ($currsubdir =~ m<^([A-Za-z0-9]+)/+(.*)>) {
$currsubdir = $2;
my $firstcomp = $1;
if ($clzz =~ m<$firstcomp/(.*)>) {
my $remain = $1;
if ($path =~ m<^(|.*/)\.\./+$>) {
$path = $1;
$clzz = $remain;
}
}
}
}
}
push @deplist, "$path$clzz.java";
next clazz; next clazz;
} }
} }

@ -4,7 +4,7 @@ SUBDIRS = util bytecode type jvm expr flow decompiler obfuscator @SWINGUI@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl \ 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@
@ -22,7 +22,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
JARFILE = jode-@VERSION@.jar JARFILE = jode-@VERSION@.jar
data_DATA = $(JARFILE) #data_DATA = $(JARFILE)
@QUOTE@-include $(MY_JAVA_FILES:.java=.dep) @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@
@ -24,9 +24,12 @@ MY_JAVA_FILES = \
MethodIdentifier.java \ MethodIdentifier.java \
ModifierMatcher.java \ ModifierMatcher.java \
NameSwapper.java \ NameSwapper.java \
OptionHandler.java \
PackageIdentifier.java \ PackageIdentifier.java \
ParseException.java \
RemovePopAnalyzer.java \ RemovePopAnalyzer.java \
Renamer.java \ Renamer.java \
ScriptParser.java \
SimpleAnalyzer.java \ SimpleAnalyzer.java \
StrongRenamer.java \ StrongRenamer.java \
TranslationTable.java \ TranslationTable.java \

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

@ -2,7 +2,7 @@
JAR = @JAR@ JAR = @JAR@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVADEP = $(top_builddir)/javaDependencies.pl\ 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@

Loading…
Cancel
Save