From 6cefdc84c7d29521d4b26ce0c6648f63fa61a078 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Sat, 25 Apr 2015 20:41:06 +0300
Subject: build.ant: allow deploy-local without symlink of bin (default remains
 with symlink)

---
 build.ant | 12 ++++++++++--
 1 file 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"
-- 
cgit v1.3.1