2002/07/15 23:03:49

darcs-hash:20040130064847-2ba56-d9a605090558da0b63767aff611a7f608506ee47.gz

diff --git a/AUTHORS b/AUTHORS
index f69b56f..50deaf1 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,13 +1,13 @@
 
-Adam Megacz <adam@xwt.org>
+[megacz] Adam Megacz <adam@xwt.org>
    - Original Architect
    - XWT Engine
    - Most of the widget set
 
-Evan Jones <ejones@uwaterloo.ca>
+[ejones] Evan Jones <ejones@uwaterloo.ca>
    - Google demo
    - Dynamic Trees
 
-David Crawshaw <david@zentus.com>
+[david] David Crawshaw <david@zentus.com>
    - Fixes to slider.xwt
 

diff --git a/ant b/ant
index 2791555..a117f51 100755 (executable)
--- a/ant
+++ b/ant
@@ -19,5 +19,5 @@ fi
 export CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
 export PATH=$PATH:$XWT_HOME/lib/
 
-$JAVA_HOME/bin/java org.apache.tools.ant.Main $@
+$JAVA_HOME/bin/java org.apache.tools.ant.Main -quiet $@
 

diff --git a/build.xml b/build.xml
index 50a8df4..7db2fcd 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -28,19 +28,26 @@
     <!-- compiles all .java files into .class files; all other tasks predepend on this since they need the <taskdef/>'s -->
     <target name="compile">
         <mkdir dir="bin/"/>
-        <echo message="compiling  .java -> .class"/>
+        <echo message="compiling   .java -> .class [xwt]"/>
         <javac destdir="bin/" deprecation="no">
             <src path="src/"/>
             <include name="**/*.java"/>
             <classpath>
+
                 <!-- don't EVER include the following line anywhere else; it causes really bizarre errors -->
                 <pathelement location="${gcc-path}/share/libgcj.jar"/>
                 <path refid="classpath"/>
+
+                <!-- this is for people who don't have libgcj.jar -->
+                <pathelement location="lib/libgcj-minimal.jar"/>
+
             </classpath>
         </javac>
         <taskdef name="bash" classname="org.xwt.tasks.BashTask">
             <classpath path="bin/"/>
         </taskdef>
+        <echo message="updating builtin.xwar"/>
+        <zip update="true" zipfile="bin/org/xwt/builtin.xwar" basedir="src" includes="org/xwt/builtin/*.png,org/xwt/builtin/*.xwt"/>
     </target>
 
     <target name="build" depends="compile">