2004/01/28 09:56:33

darcs-hash:20040130080531-2ba56-1769f4e8961e1950906029c8d908cfd89afe9422.gz

diff --git a/Makefile b/Makefile
index c6d0d76..fc29a6a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,10 @@ foo: .compile
        make .install_jode-1.1.1_java target=java
        cd build; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/Object.class
        java -cp upstream/java-getopt-1.0.9:upstream/jode-1.1.1/build-java jode.obfuscator.Main jode.conf
+       cd out; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/
+       cd build/class; tar cf - org/ | tar -C ../../out -xvf -
+       cd out ; rm -rf gnu/java/awt gnu/java/beans gnu/java/rmi java/rmi java/beans java/awt java/sql
+       for A in `find out -name \*.class`; do cd `dirname $$A`; $(shell pwd)/$(gcj) -c `basename $$A` -fCLASSPATH=$(shell pwd)/out; cd $(shell pwd); done
 
 darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
 darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
@@ -114,7 +118,7 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java
        mkdir -p build/class/org/xwt/util/
        ./.jikes $<
 
-oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java`
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java`
 compile: .compile
 .compile: $(java_sources) .jikes .install_mips2java
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"

diff --git a/jode.conf b/jode.conf
index edf2497..88c5db7 100644 (file)
--- a/jode.conf
+++ b/jode.conf
@@ -12,8 +12,13 @@ load = new WildCard { value = "org.xwt.*" },
        new WildCard { value = "java.*" }
 
 preserve = new WildCard { value = "org.xwt.Main" },
-           new WildCard { value = "org.xwt.plat.Linux" }
-
+           new WildCard { value = "org.xwt.plat.Linux" },
+new WildCard { value="java.lang" },
+new WildCard { value="gnu.gcj.protocol" },
+new WildCard { value="java.net.URLConnection" },
+new WildCard { value="java.net.JarURLConnection" },
+new WildCard { value="java.net.HttpURLConection" },
+new WildCard { value="java.security.Policy" }
 #           new MultiIdentifierMatcher { 
 #               and = new WildCard { value = "org.myorg.publiclib.*" },
 #                   new ModifierMatcher { access = "PUBLIC" }