X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=build.xml;h=4dbd098e1468fd18569e88d50c960055cb638207;hb=9647820405bbad9395e425114d6a7e61c8744229;hp=3b09121c1a96fcacad696c3333a62d83163d920c;hpb=88ffc93f505271834240412c9d17c4dea1b8ab77;p=org.ibex.core.git
diff --git a/build.xml b/build.xml
index 3b09121..4dbd098 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
-
+
@@ -71,32 +71,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -107,42 +93,65 @@
-
- # throw on the prefix/suffix where needed
- for A in `find www/html -name \*.html_`
- do (cat www/html/prefix.html; cat $A; cat www/html/suffix.html; cat "$A"_ 2>/dev/null; cat www/html/tagline.html) > `echo $A | sed s/_\$//g`
- done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ cvs commit -m "automatically updated build-id via org.xwt.tasks.BuildIdTask" build.properties
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /home/megacz/bin/sign/sign ${build-id}
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ # throw on the prefix/suffix where needed
+ for A in `find www/html -name \*.html_`
+ do (cat www/html/prefix.html; cat $A; cat www/html/suffix.html; cat "$A"_ 2>/dev/null; cat www/html/tagline.html) > `echo $A | sed s/_\$//g`
+ done
+
+
# first, clone the currently running copy of xwt, so we can use rsync to save bandwidth
rm -rf /xwt-new
@@ -155,7 +164,8 @@
# 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/
@@ -163,9 +173,10 @@
/sbin/start-stop-daemon --stop --pidfile /var/log/xwt/apache.pid --exec /usr/sbin/apache
/sbin/start-stop-daemon --stop --pidfile /var/log/xwt/tomcat.pid --user www-data
- rm -rf /xwt-old
- mv /xwt /xwt-old
+ rm -rf /xwt-`date +%d-%b-%H:%M`
+ mv /xwt /xwt-`date +%d-%b-%H:%M`
mv /xwt-new /xwt
+ find /xwt-* -prune -type d -mtime +10 | xargs rm -rf
mkdir /var/log/xwt &>/dev/null
chown www-data /var/log/xwt/
@@ -191,7 +202,6 @@
/sbin/start-stop-daemon --start --pidfile /var/log/xwt/apache.pid --exec /usr/sbin/apache -- -f /xwt/www/etc/httpd.conf ${staging-flag}
-