From 86de2ba2b7c5a1b37c328a7fa2e88cad6af87255 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Wed, 10 Dec 2014 15:24:18 +0200
Subject: symlink against src-py during deploy-local

---
 build.ant | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.ant b/build.ant
index ec17c283..0b973df3 100644
--- a/build.ant
+++ b/build.ant
@@ -35,7 +35,7 @@
    </target>
 
    <target name="deploy-local.clean">
-      <delete dir="deploy-local">
+      <delete dir="deploy-local" followsymlinks="false">
          <include name="**/*" />
       </delete>
    </target>
@@ -52,7 +52,6 @@
       <property name="src_server" value="${rzRootDir}/rhizi-server" />
       <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" />
 
-      <mkdir dir="${dst}/bin" />
       <mkdir dir="${dst}/static" />
 
       <parallel>
@@ -61,7 +60,10 @@
          <rsync src="${src_client}/res" dst="${dst}/static" />
          <rsync src="${src_client}/lib" dst="${dst}/static" />
 
-         <rsync src="${src_server}/src-py/" dst="${dst}/bin" />
+         <exec executable="/bin/ln">
+            <arg line="-rs -T ${src_server}/src-py ${dst}/bin" />
+         </exec>
+
          <rsync src="${src_server}/res/etc" dst="${dst}" />
          <rsync src="${src_server}/res/templates/" dst="${dst}/templates" />
       </parallel>
@@ -81,7 +83,7 @@
 
       <rsync src="${src_server}/deploy-local/"
              dst="rsync://${dstServer}/${module}/" />
-   
+
       <parallel>
          <!-- apply production patches -->
          <rsync src="${src_server}/res/production-patch-set/rhizi-server.production.conf"
@@ -92,6 +94,11 @@
       </parallel>
    </target>
 
+   <target name="deploy-remote.htpasswd.db" description="manual invocation">
+      <rsync src="${src_server}/res/production-patch-set/htpasswd.db"
+             dst="root@rz_0.unige.ch:/srv/www/rhizi/auth/" />
+   </target>
+
    <target name="pkg-deb" depends="clean" description="package as .deb">
       <mkdir dir="dist" />
       <mkdir dir="${buildDir}" />
-- 
cgit v1.3.1