From 44f59f706bbfe02e0e833774e9bbc8fdffc920b1 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Wed, 29 Apr 2015 17:25:56 +0300
Subject: build.ant: refactor deploy-local: reorder, format

---
 build.ant | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/build.ant b/build.ant
index 571f6806..945e38b9 100644
--- a/build.ant
+++ b/build.ant
@@ -100,23 +100,7 @@
 
       <!-- note: defaults to not overwriting, so rhizi-server.conf is safe  -->
 
-      <!-- copy defaults-->
       <parallel>
-         <copy file="res/etc/rhizi-server.conf.example"
-               tofile="res/etc/rhizi-server.conf" />
-         <copy todir="${targetDeploymentDir}/templates/fragment"
-               failonerror="false">
-            <fileset dir="res/local/template/fragment/by-domain/${defaultDomain}"
-                     includes="*" />
-         </copy>
-      </parallel>
-
-      <client-optimize if:true="${doClientOptimize}"
-                       root="src/client/"
-                       build="build.js" />
-
-      <parallel>
-
          <!-- code -->
          <rsync src="${src_client}/" dst="${targetDeploymentDir}/static/js" />
 
@@ -126,7 +110,8 @@
                   link="${targetDeploymentDir}/bin"
                   resource="${basedir}/${src_server}" />
          <rsync unless:true="${localServerUseSymlink}"
-                src="${basedir}/${src_server}/" dst="${targetDeploymentDir}/bin" />
+                src="${basedir}/${src_server}/"
+                dst="${targetDeploymentDir}/bin" />
 
          <!-- conf-->
          <copy file="res/etc/rhizi-server.conf"
@@ -141,7 +126,22 @@
                tofile="${targetDeploymentDir}/user_db.db"
                failonerror="false" />
 
-         <!-- domain specific: schema, templates, fragments-->
+         <!-- domain specific defaults-->
+         <copy file="res/etc/rhizi-server.conf.example"
+               tofile="res/etc/rhizi-server.conf" />
+         <copy todir="${targetDeploymentDir}/templates/fragment"
+               failonerror="false">
+            <fileset dir="res/local/template/fragment/by-domain/${defaultDomain}"
+                     includes="*" />
+         </copy>
+      </parallel>
+
+      <client-optimize if:true="${doClientOptimize}"
+                       root="src/client/"
+                       build="build.js" />
+
+      <parallel>
+         <!-- domain specific overrides -->
          <copy file="src/local/domain/${targetDomain}/domain_types.js"
                tofile="${targetDeploymentDir}/static/js/model/domain_types.js" />
          <copy todir="${targetDeploymentDir}/templates/fragment"
-- 
cgit v1.3.1