2002/10/12 19:53:50

darcs-hash:20040130065045-2ba56-10aaefd468d4f4b86f00b19988b0db2c88cf2318.gz

diff --git a/CHANGES b/CHANGES
index 631953d..d6cc8b9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -432,6 +432,10 @@
 03-Oct megacz XWT.java: made recursivePrintObject public so we can
               access it.
 
-03-Oct megacz POSIX.cc: fixed a bug that was causing phantom messages
+11-Oct megacz POSIX.cc: fixed a bug that was causing phantom messages
               after window deletion
 
+11-Oct megacz README, Resources.java, GCJ.xml, jazz/*: upgraded to gcj
+              3.3; eliminated jazzlib; introduced compile hack because
+              3.3 miscompiles Trap.java
+

diff --git a/README b/README
index 9a24a92..bca8015 100644 (file)
--- a/README
+++ b/README
@@ -58,7 +58,6 @@ Directory Structure
        javasrc.jar       - javasrc, a tool for generating hyperlinked, syntax-colored html from java code
 
    src/                  - all java source files and xwt sources go here
-       jazz/             - jazzlib, which XWT currently uses since libgcj's java.util.zip.* is broken
        org/
            bouncycastle/ - the BouncyCastle Crypto Library
            mozilla/      - a copy of Rhino, the Mozilla JavaScript interpreter
@@ -109,11 +108,11 @@ Building
 
 
 - The Win32 native version of XWT can ONLY be built with the very
-  latest pre-release of GCC 3.1. You can follow the steps below to
+  latest pre-release of GCC 3.3. You can follow the steps below to
   create a cross-compiler from linux to Win32.
 
-  If the steps below fail, try adding "-D 20-Mar-2002" to the cvs
-  checkout line; 20-Mar-2002 was the last date on which the compiler
+  If the steps below fail, try adding "-D 11-Oct-2002" to the cvs
+  checkout line; 11-Oct-2002 was the last date on which the compiler
   was known to work. Please don't do this unless you have attempted
   without it, however, since it puts additional strain on the gcc cvs
   server.
@@ -161,15 +160,15 @@ Building
                    --enable-gc-type=boehm \
                    --disable-shared \
                    --enable-threads=win32 \
-                   --disable-hash-synchronization \
+                   --enable-hash-synchronization \
                    --disable-interpreter \
                    --enable-sjlj-exceptions
   
   make
   sudo make install
 
-- The Linux native version is still experimental. You should configure
-  your compiler with:
+- The Linux native version can also be built with the latest
+  prerelease of gcj 3.3. You should configure your compiler with:
 
   ../gcc/configure \
                    --prefix=$PREFIX \

diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index d525ad0..a4459d0 100644 (file)
--- a/src/org/xwt/Resources.java
+++ b/src/org/xwt/Resources.java
@@ -4,7 +4,7 @@ package org.xwt;
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import jazz.*;
+import java.util.zip.*;
 import java.lang.*;
 import java.applet.*;
 import org.mozilla.javascript.*;

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index fae6954..f52fe68 100644 (file)
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -22,22 +22,36 @@
 
         <echo message='compiling   .java -> .o'/>
         <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
-            <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar:src/'/>
+            <arg value='-fCLASSPATH=bin/'/>
             <arg value='-O9'/>
             <arg value='-g'/>
-            <arg value='-Isrc/'/>
             <arg value='-c'/>
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
             <fileset dir='src/'>
-                <include name='jazz/**/*.java'/>
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
                 <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
+                <exclude name='org/xwt/Trap.java'/>
+            </fileset>
+            <mapper type='glob' from='*.java' to='*.o'/>
+        </apply>
+
+        <!-- we have to turn off optimization here due to a compiler bug -->
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
+            <arg value='-fCLASSPATH=bin/'/>
+            <arg value='-O0'/>
+            <arg value='-g'/>
+            <arg value='-c'/>
+            <srcfile/>
+            <arg value='-o'/>
+            <targetfile/>
+            <fileset dir='src/'>
+                <include name='org/xwt/Trap.java'/>
             </fileset>
             <mapper type='glob' from='*.java' to='*.o'/>
         </apply>