better

darcs-hash:20040225191103-5007d-2a56c0fc1d8683b6e2e7bd1109930eab1a7416dc.gz

diff --git a/Makefile b/Makefile
index b605550..3b54455 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -286,6 +286,7 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
        PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
                -Wl,-O2,--relax,--gc-sections,--noinhibit-exec                       \
                --main=org.ibex.plat.$(platform)                                     \
        PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
                -Wl,-O2,--relax,--gc-sections,--noinhibit-exec                       \
                --main=org.ibex.plat.$(platform)                                     \

+               -Dfile.encoding=UTF8                                                 \

                -Lupstream/install/$(target)/lib                                     \
                -Lupstream/install/lib                                               \
                -Os -w                                                               \
                -Lupstream/install/$(target)/lib                                     \
                -Lupstream/install/lib                                               \
                -Os -w                                                               \

diff --git a/src/org/ibex/util/BytecodePruner.java b/src/org/ibex/util/BytecodePruner.java
index 18231fb..6243ffa 100644 (file)
--- a/src/org/ibex/util/BytecodePruner.java
+++ b/src/org/ibex/util/BytecodePruner.java
@@ -86,20 +86,16 @@ public class BytecodePruner {
         bcp.loadAllMethods("gnu.gcj.convert.Input_UTF8");      // retrieved via reflection
         bcp.loadAllMethods("gnu.gcj.convert.Output_UTF8");     // retrieved via reflection
 
         bcp.loadAllMethods("gnu.gcj.convert.Input_UTF8");      // retrieved via reflection
         bcp.loadAllMethods("gnu.gcj.convert.Output_UTF8");     // retrieved via reflection
 

-

         bcp.loadAllMethods("gnu.gcj.protocol.http.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.file.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.core.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.jar.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.http.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.file.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.core.Handler");
         bcp.loadAllMethods("gnu.gcj.protocol.jar.Handler");

-        bcp.loadAllMethods("gnu.gcj.convert.Input_8859_1");    // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Output_8859_1");   // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Input_ASCII");     // retrieved via reflection
-        bcp.loadAllMethods("gnu.gcj.convert.Output_ASCII");    // retrieved via reflection
-

 
 

+        /*

         bcp.loadAllMethods("java.util.Date");
         bcp.loadAllMethods("java.text.DateFormat");
         bcp.loadAllMethods("java.text.NumberFormat");
         bcp.loadAllMethods("java.util.Date");
         bcp.loadAllMethods("java.text.DateFormat");
         bcp.loadAllMethods("java.text.NumberFormat");

+        */

 
         Method[] meths = getMethods(repo.loadClass("org.ibex.plat.Linux"));
         for(int i=0; i<meths.length; i++) {
 
         Method[] meths = getMethods(repo.loadClass("org.ibex.plat.Linux"));
         for(int i=0; i<meths.length; i++) {

@@ -158,7 +154,7 @@ public class BytecodePruner {
         int numMethods = 0;
         boolean good = false;
         for(int i=0; i<methods.length; i++) {
         int numMethods = 0;
         boolean good = false;
         for(int i=0; i<methods.length; i++) {

-            if (dest.contains(methods[i]) /*&& (constructed || !methods[i].isStatic())*/) {
+            if (dest.contains(methods[i]) && (constructed || !methods[i].isStatic())) {

                 if (!methods[i].getName().equals("<clinit>")) good = true;
             } else {
                 if (methods[i].getCode() == null) {
                 if (!methods[i].getName().equals("<clinit>")) good = true;
             } else {
                 if (methods[i].getCode() == null) {