From: Gunnar Wrobel <p@rdus.de>
Date: Sun, 3 Oct 2010 19:50:57 +0000 (+0200)
Subject: Use rsync to copy packages from the framework. Add new required options.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1dbacff7dc36a41d5ec67f27524b437cb67d6bd1;p=horde.git

Use rsync to copy packages from the framework. Add new required options.
---

diff --git a/components/data/hudson-component-config.xml.template b/components/data/hudson-component-config.xml.template
index 092cbaf59..e64119100 100644
--- a/components/data/hudson-component-config.xml.template
+++ b/components/data/hudson-component-config.xml.template
@@ -18,10 +18,10 @@
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>rsync -avz ${WORKSPACE}/../../%2$s/workspace/%1$s/* ${WORKSPACE}/ --exclude="build.xml" --delete-after
-mkdir ${WORKSPACE}/deps
+      <command>rsync -avz --exclude="build.xml" --delete-after ${WORKSPACE}/../../%2$s/workspace/%1$s/* ${WORKSPACE}/
+mkdir -p ${WORKSPACE}/deps
 php -d include_path=&quot;.:${WORKSPACE}/../../%3$s/php&quot; ${WORKSPACE}/../../%3$s/horde-components --install=${WORKSPACE}/deps -N ${WORKSPACE}/../../%2$s/workspace/%1$s
-php -d include_path=&quot;.:${WORKSPACE}/../../%3$s/php&quot; ${WORKSPACE}/../../%3$s/horde-components --ciprebuild=${WORKSPACE} ${WORKSPACE}/../../%2$s/workspace/%1$s
+php -d include_path=&quot;.:${WORKSPACE}/../../%3$s/php&quot; ${WORKSPACE}/../../%3$s/horde-components --ciprebuild=${WORKSPACE} --pearrc=${WORKSPACE}/../../%3$s/../.pearrc ${WORKSPACE}/../../%2$s/workspace/%1$s
     </command>
     </hudson.tasks.Shell>
     <hudson.tasks.Ant>