X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=build.xml;h=e4a4bf894d1bfafb89ada9eba2a913259c8ca9b1;hb=59504c32ab91b8017865c1450b8dfcb787939034;hp=7db2fcd274905ae433cc388fed466f17e73c848b;hpb=32ed78b123abdc021b3a830c6d8bf413b2131910;p=org.ibex.core.git

diff --git a/build.xml b/build.xml
index 7db2fcd..e4a4bf8 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<project name="xwt" default="run" basedir=".">
+<project name="xwt" default="compile" basedir=".">
 
     <!-- required so that libgcj.jar doesn't interfere with non-gcj compilation -->
     <property name="build.sysclasspath" value="first"/>
@@ -18,11 +18,25 @@
 
     <!-- purges binaries we've built -->
     <target name="clean">
-        <bash>
-            find . -name \*\~ | xargs rm -f
-            find . -name \#\*\# | xargs rm -f
-            rm -rf bin-* bin
-        </bash>
+        <delete quiet="true" dir="bin"/>
+        <delete quiet="true">
+            <fileset dir="./" casesensitive="yes" defaultexcludes="no">
+                <include name="bin-*"/>
+                <include name="**/*~"/>
+                <include name="**/#*#"/>
+                <exclude name="**/.#*"/>
+                <exclude name="**/%*%"/>
+                <exclude name="**/._*"/>
+                <exclude name="**/CVS"/>
+                <exclude name="**/CVS/**"/>
+                <exclude name="**/.cvsignore"/>
+                <exclude name="**/SCCS"/>
+                <exclude name="**/SCCS/**"/>
+                <exclude name="**/vssver.scc"/>
+                <exclude name="**/.svn"/>
+                <exclude name="**/.svn/**"/>
+            </fileset>
+        </delete>
     </target>
 
     <!-- compiles all .java files into .class files; all other tasks predepend on this since they need the <taskdef/>'s -->
@@ -43,28 +57,12 @@
 
             </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"/>
+        <echo message="updating     .xwt -> .xwar"/>
+        <zip update="true" zipfile="bin/org/xwt/builtin.xwar" basedir="src" includes="org/xwt/builtin/*.png,org/xwt/builtin/*.xwt,org/xwt/builtin/*.xwf"/>
     </target>
 
     <target name="build" depends="compile">
         <ant dir="." antfile="src/org/xwt/plat/${plat}.xml" target="build"/>
     </target>
 
-    <target name="run" depends="compile,build">
-        <ant dir="." antfile="src/org/xwt/plat/${plat}.xml" target="run"/>
-    </target>
-
 </project>
-
-
-       <!-- old javago optimization code - - reintegrate at some point
-          lib/javago.`uname` -threshold 300 -not-inline-constructor -not-use-invokespecial org/xwt/Box.class
-          lib/javago.`uname` -threshold 300 -not-inline-constructor -not-use-invokespecial org/xwt/Box.class
-          lib/javago.`uname` -threshold 200 -not-inline-constructor -not-use-invokespecial org/xwt/Surface.class
-          lib/javago.`uname` -threshold 50 -not-inline-constructor -not-use-invokespecial org/xwt/GetPutHandler*
-          lib/javago.`uname` -threshold 200 -not-inline-constructor -not-use-invokespecial org/xwt/util/DirtyList.class
-       -->