summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-04-15 00:47:20 +0300
committerLV-426 <lv-426@taproot.org.il>2015-04-15 00:48:20 +0300
commitd61d9edace7cd9a19a2db256695b949ab1ea852c (patch)
tree2d939c562fffb75ce88f478e5f6c95db1169c723
parent412df48c469917d896cb4a4de0d3a0d166f66e7f (diff)
build.ant: deploy server-tools only on deployRemote
-rw-r--r--build.ant13
1 files changed, 5 insertions, 8 deletions
diff --git a/build.ant b/build.ant
index 288fd3a7..812a8181 100644
--- a/build.ant
+++ b/build.ant
@@ -26,9 +26,9 @@
<attribute name="root" />
<attribute name="build" />
<sequential>
- <exec dir="@{root}" executable="/usr/bin/r.js" failonerror="true">
+ <exec dir="@{root}" executable="/usr/bin/r.js" failonerror="true">
<arg line="-o @{build}" />
- </exec>
+ </exec>
</sequential>
</macrodef>
@@ -134,12 +134,6 @@
<fileset dir="res/local/template/fragment/by-domain/${targetDomain}" />
</copy>
- <!-- tools. use cp to preserve permissions (copy doesn't).
- out of parallel so ${targetDeploymentDir}/bin is already created -->
- <exec executable="cp" failonerror="true">
- <arg line="-R src/local/server-tools ${targetDeploymentDir}/tools"/>
- </exec>
-
</parallel>
</target>
@@ -167,6 +161,9 @@
src="res/production-patch-set/${targetDomain}/rhizi-server.production.conf"
dst="rsync://${remoteDeployServer}/${rsync_module}/rhizi.net/etc/rhizi-server.conf" />
+ <rsync src="src/local/server-tools"
+ dst="rsync://${remoteDeployServer}/${rsync_module}/" />
+
</parallel>
</target>