diff options
| author | LV-426 <lv-426@taproot.org.il> | 2014-12-03 16:35:54 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2014-12-03 16:57:07 +0200 |
| commit | 8520c13b3c6471e61bb994cfb3621a6057d47803 (patch) | |
| tree | 69ec68d05436591db16b61870c5daf3aa0d6cfd5 | |
| parent | fe15146a7031554e6c82791d1ba68e31e5ecedc8 (diff) | |
speedup deployment via <parallel>, update layout
| -rw-r--r-- | build.ant | 44 |
1 files changed, 27 insertions, 17 deletions
@@ -33,41 +33,51 @@ </target> <target name="deploy-local" description="locally deploy webapp"> - <local name="src__client" /> - <local name="src__server" /> + <local name="src_client" /> + <local name="src_server" /> <local name="dst" /> - <property name="src__client" value="${rzRootDir}/rhizi-client" /> - <property name="src__server" value="${rzRootDir}/rhizi-server" /> + <property name="src_client" value="${rzRootDir}/rhizi-client" /> + <property name="src_server" value="${rzRootDir}/rhizi-server" /> <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" /> <parallel> <!-- [!] trailing '/' critical --> - <rsync src="${src__client}/src/" dst="${dst}/static" /> - <rsync src="${src__client}/res" dst="${dst}/static" /> - <rsync src="${src__client}/lib" dst="${dst}/static" /> + <rsync src="${src_client}/src/" dst="${dst}/static" /> + <rsync src="${src_client}/res" dst="${dst}/static" /> + <rsync src="${src_client}/lib" dst="${dst}/static" /> - <rsync src="${src__server}/src-py" dst="${dst}" /> - <rsync src="${src__server}/res/etc" dst="${dst}" /> - <rsync src="${src__server}/res/templates/" dst="${dst}/templates" /> + <rsync src="${src_server}/src-py" dst="${dst}" /> + <rsync src="${src_server}/res/etc" dst="${dst}" /> + <rsync src="${src_server}/res/templates/" dst="${dst}/templates" /> </parallel> </target> <target name="deploy-remote" depends="deploy-local"> - <local name="src" /> + <local name="src_server" /> + <local name="src_client" /> <local name="dstPath" /> <local name="dstServer" /> - <property name="src" value="${rzRootDir}/rhizi-server/deploy-local" /> + <property name="src_client" value="${rzRootDir}/rhizi-client" /> + <property name="src_server" value="${rzRootDir}/rhizi-server" /> <property name="dstPath" value="/srv/www/rhizi/rhizi.net" /> <property name="dstServer" value="rz_0.unige.ch" /> - <rsync src="${src}/" dst="root@${dstServer}:${dstPath}" /> - <rsync src="${rzRootDir}/rhizi-server/res/etc/rhizi-server.production.conf" - dst="root@${dstServer}:/etc/rhizi/rhizi-server.conf" /> - <rsync src="${src}/etc/htpasswd.db" - dst="root@${dstServer}:${dstPath}/../auth/" /> + <parallel> + <rsync src="${src_server}/deploy-local/" + dst="root@${dstServer}:${dstPath}" /> + + <!-- apply production patches --> + <rsync src="${src_server}/res/production-patch-set/rhizi-server.production.conf" + dst="root@${dstServer}:/etc/rhizi/rhizi-server.conf" /> + <rsync src="${src_server}/res/production-patch-set/rz_config.js" + dst="root@${dstServer}:${dstPath}/static" /> + <rsync src="${src_server}/res/production-patch-set/htpasswd.db" + dst="root@${dstServer}:${dstPath}/../auth/" /> + + </parallel> </target> <target name="pkg-deb" depends="clean" description="package as .deb"> |