summaryrefslogtreecommitdiff
path: root/build.ant
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-04-25 20:41:06 +0300
committerAlon Levy <alon@pobox.com>2015-04-25 21:05:19 +0300
commit6cefdc84c7d29521d4b26ce0c6648f63fa61a078 (patch)
tree70eaa14be89e20a309ab4624c3faa7e2312d5c1a /build.ant
parentaafae6f846f533cedc4eab1857aab97395a0be31 (diff)
build.ant: allow deploy-local without symlink of bin (default remains with symlink)
Diffstat (limited to 'build.ant')
-rw-r--r--build.ant12
1 files changed, 10 insertions, 2 deletions
diff --git a/build.ant b/build.ant
index f86d3033..0d9344e2 100644
--- a/build.ant
+++ b/build.ant
@@ -3,7 +3,10 @@
Rhizi build targets
-->
-<project name="rhizi-server" default="pkg-deb" xmlns:if="ant:if">
+<project name="rhizi-server" default="pkg-deb"
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless"
+ >
<macrodef name="rsync">
<attribute name="src" />
@@ -42,6 +45,7 @@
<property name="remoteDeployServer" value="rz-0.unige.ch" />
<property name="targetDomain" value="default.rhizi.net" />
<property name="doClientOptimize" value="false" />
+ <property name="localServerUseSymlink" value="true" />
<property name="defaultDomain" value="default.rhizi.net" />
<tstamp>
@@ -111,10 +115,14 @@
<!-- code -->
<rsync src="${src_client}/" dst="${targetDeploymentDir}/static" />
- <symlink action="single"
+
+ <symlink if:true="${localServerUseSymlink}"
+ action="single"
overwrite="true"
link="${targetDeploymentDir}/bin"
resource="${basedir}/${src_server}" />
+ <rsync unless:true="${localServerUseSymlink}"
+ src="${basedir}/${src_server}/" dst="${targetDeploymentDir}/bin" />
<!-- conf-->
<copy file="res/etc/rhizi-server.conf"