summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-04-12 18:43:01 +0300
committerLV-426 <lv-426@taproot.org.il>2015-04-12 18:44:55 +0300
commit19798975922c37bcb4667d40e73bb6f735e2d013 (patch)
tree68c11dcee136e927fbc0abc16ad130ededc8c69e
parent15d57261ed988213da5294c6ed6e58741df547c8 (diff)
build.ant: fix fragment override - fixes #476
-rw-r--r--build.ant9
1 files changed, 4 insertions, 5 deletions
diff --git a/build.ant b/build.ant
index 095b1cc9..be90bc46 100644
--- a/build.ant
+++ b/build.ant
@@ -106,7 +106,7 @@
<parallel>
- <!-- code-->
+ <!-- code -->
<rsync src="${src_client}/" dst="${targetDeploymentDir}/static" />
<symlink action="single"
overwrite="true"
@@ -117,7 +117,7 @@
<copy file="res/etc/rhizi-server.conf"
tofile="${targetDeploymentDir}/etc/rhizi-server.conf" />
- <!-- res-->
+ <!-- res -->
<rsync src="res/client/" dst="${targetDeploymentDir}/static" />
<rsync src="res/templates/" dst="${targetDeploymentDir}/templates/" />
@@ -130,9 +130,8 @@
<copy file="src/local/domain/${targetDomain}/domain_types.js"
tofile="${targetDeploymentDir}/static/model/domain_types.js" />
<copy todir="${targetDeploymentDir}/templates/fragment"
- failonerror="false">
- <fileset dir="res/local/template/fragment/by-domain/${targetDomain}"
- includes="*" />
+ overwrite="true">
+ <fileset dir="res/local/template/fragment/by-domain/${targetDomain}" />
</copy>
<!-- tools. use cp to preserve permissions (copy doesn't).