X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=build.xml;h=767fa2cbe46cb315c761917bd7f2f01f06b013b6;hb=d22fb3d5210a72c35afce35ee9779e7ccfa5da00;hp=3b09121c1a96fcacad696c3333a62d83163d920c;hpb=88ffc93f505271834240412c9d17c4dea1b8ab77;p=org.ibex.core.git

diff --git a/build.xml b/build.xml
index 3b09121..767fa2c 100644
--- a/build.xml
+++ b/build.xml
@@ -71,26 +71,6 @@
         <ant dir="." antfile="src/org/xwt/plat/${plat}.xml" target="build"/>
     </target>
 
-    <target name="dist" depends="compile,build">
-
-        <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/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/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/**"
-             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"/>
-
-    </target>
-
     <target name="run" depends="compile,build">
         <ant dir="." antfile="src/org/xwt/plat/${plat}.xml" target="run"/>
     </target>
@@ -115,15 +95,6 @@
         </bash>
     </target>
 
-    <target name="compile-server">
-        <mkdir dir="www/webapps/classes/"/>
-        <mkdir dir="www/webapps/lib/"/>
-        <javac destdir="www/webapps/classes/" deprecation="no">
-            <src path="www/src/"/>
-            <classpath refid="classpath"/>
-        </javac>
-    </target>
-
     <target name="staging">
         <property name="staging-flag" value="-Dstaging"/>
         <property name="host" value="xwt-staging.org"/>
@@ -136,9 +107,43 @@
         <antcall target="really-push"/>
     </target>
 
+    <target name="newbuild" depends="compile">
+        <taskdef name="build-id" classname="org.xwt.tasks.BuildIdTask">
+            <classpath path="bin/"/>
+        </taskdef>
+        <build-id/>
+        <bash> cvs commit -m "automatically updated build-id via org.xwt.tasks.BuildIdTask" build.properties </bash>
+        <property file="build.properties"/>
+        
+        <mkdir dir="www/html/dist/"/>
+
+        <!-- rebuild distributions -->
+        <property name="plat" value="Win32"/>
+        <ant dir="." antfile="src/org/xwt/plat/Win32.xml" target="build"/>
+        <ant dir="." antfile="src/org/xwt/plat/Win32.xml" target="dist"/>
+        <property name="plat" value="Java2"/>
+        <ant dir="." antfile="src/org/xwt/plat/Java12.xml" target="build"/>
+        <ant dir="." antfile="src/org/xwt/plat/Java12.xml" target="dist"/>
+
+        <!-- sign stuff -->
+        <bash> /home/megacz/bin/sign/sign ${build-id} </bash>
+    </target>
+
     <!-- required packages: bind, apache, libapache-mod-ssl, libapache-mod-jk, sshd, rsync, j2sdk, tomcat, gnuchess -->
     <target name="really-push" depends="compile,www">
 
+        <!-- update demo xwars -->
+        <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/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/**"
+             excludes="org/xwt/mail/main.xwt"
+             />
+        <zip update="true" zipfile="www/html/mail.xwar" basedir="src/org/xwt/mail/" includes="main.xwt"/>
+
+        <mkdir dir="www/webapps/classes/"/>
         <copy todir="www/webapps/classes/">
             <fileset dir="bin/" includes="org/xwt/server/**"/>
         </copy>
@@ -155,7 +160,8 @@
         <bash>
             # tidy up and rsync our changes
             find www/html -name \*~ | xargs rm -f
-            rsync -Pv --delete -rze ssh www/ root@${host}:/xwt-new/www/
+            rsync -Pv --delete --exclude=html/dist/\* -rze ssh www/ root@${host}:/xwt-new/www/
+            rsync -u -Pv -rze ssh www/html/dist/ root@${host}:/xwt-new/www/html/dist/
         </bash>
 
         <bash host="root@${host}">
@@ -191,7 +197,6 @@
 
             /sbin/start-stop-daemon --start --pidfile /var/log/xwt/apache.pid --exec /usr/sbin/apache -- -f /xwt/www/etc/httpd.conf ${staging-flag}
         </bash>
-
     </target>