2002/03/21 02:21:06

darcs-hash:20040130064513-2ba56-e83869f625f93375d5a9bab0d2954ba49daba0bf.gz

diff --git a/build.xml b/build.xml
index 30e9c91..79980cd 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -17,6 +17,9 @@
     <path id="classpath">
         <pathelement path="${envCLASSPATH}"/>
         <pathelement path="bin/"/>
+        <fileset dir="www/webapps/lib">
+            <include name="**/*.jar"/>
+        </fileset>
         <fileset dir="lib">
             <include name="**/*.jar"/>
         </fileset>
@@ -72,16 +75,16 @@
 
         <mkdir dir="www/html/dist/"/>
 
-        <zip update="true" zipfile="www/html/demo.xwar" basedir="src"
-             includes="org/xwt/demo/**,xwt/standard/**,org/xwt/themes/**"/>
+        <zip update="true" zipfile="www/html/demo.xwar" basedir="src" includes="org/xwt/demo/**,xwt/standard/**,org/xwt/themes/**"/>
         <zip update="true" zipfile="www/html/demo.xwar" basedir="src/org/xwt/demo/" includes="main.xwt"/>
 
-        <zip update="true" zipfile="www/html/chess.xwar" basedir=src"
-             includes="org/xwt/chess/**,xwt/standard/**,org/xwt/themes/**"/>
+        <zip update="true" zipfile="www/html/chess.xwar" basedir="src" includes="org/xwt/chess/**,xwt/standard/**,org/xwt/themes/**"/>
         <zip update="true" zipfile="www/html/chess.xwar" basedir="src/org/xwt/chess/" includes="main.xwt"/>
 
         <zip update="true" zipfile="www/html/mail.xwar" basedir="src"
-             includes="org/xwt/mail/**,xwt/standard/**,org/xwt/themes/**,org/gimp/tigert/**,org/xwt/fonts/**"/>
+             includes="org/xwt/mail/**,xwt/standard/**,org/xwt/themes/**,org/gimp/tigert/**,org/xwt/fonts/**"
+             excludes="org/xwt/mail/main.xwt"
+             />
         <zip update="true" zipfile="www/html/mail.xwar" basedir="src/org/xwt/mail/" includes="main.xwt"/>
 
         <ant dir="." antfile="src/org/xwt/plat/${plat}.xml" target="dist"/>
@@ -126,9 +129,6 @@
 
             find www/html -name \*~ | xargs rm -f
 
-            # this is still pretty ugly...
-            cp lib/j2ee-javax.jar lib/xmlrpc.jar lib/imap.jar lib/pop3.jar lib/mail.jar lib/mailapi.jar www/webapps/lib/
-
             # throw on the prefix/suffix where needed
             rm -f /tmp/delete-$$
             for A in `find www/html -name \*.html_`