From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 25 Aug 2010 11:04:07 +0000 (+0200)
Subject: Do not include stuff from the dependency location while we are actually installing... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=93a5bec1827ff8a90bd7e8e5bfd2f654281871be;p=horde.git

Do not include stuff from the dependency location while we are actually installing the dependencies.
---

diff --git a/framework/Element/data/hudson-element-config.xml.template b/framework/Element/data/hudson-element-config.xml.template
index 68a62d6dc..5ab789d2a 100644
--- a/framework/Element/data/hudson-element-config.xml.template
+++ b/framework/Element/data/hudson-element-config.xml.template
@@ -19,9 +19,13 @@
   <builders>
     <hudson.tasks.Shell>
       <command>cp -r ${WORKSPACE}/../../%2$s/workspace/%1$s/* ${WORKSPACE}/
+echo &quot;include_path = \&quot;.:${WORKSPACE}/../../%3$s/php\&quot;&quot; &gt; ${WORKSPACE}/php.ini
+rm -rf ${WORKSPACE}/deps
+mkdir ${WORKSPACE}/deps
+php -c php.ini ${WORKSPACE}/../../%3$s/horde-element --install=${WORKSPACE}/deps ${WORKSPACE}/../../%2$s/workspace/%1$s
+php -c php.ini ${WORKSPACE}/../../%3$s/horde-element --ciprebuild=${WORKSPACE} ${WORKSPACE}/../../%2$s/workspace/%1$s
 echo &quot;include_path = \&quot;.:${WORKSPACE}/lib:${WORKSPACE}/deps/pear/php:${WORKSPACE}/../../%3$s/php\&quot;&quot; &gt; ${WORKSPACE}/php.ini
-php -c php.ini ../../%3$s/horde-element --install=${WORKSPACE}/deps ../../%2$s/workspace/%1$s
-php -c php.ini ../../%3$s/horde-element --ciprebuild=${WORKSPACE} ../../%2$s/workspace/%1$s</command>
+    </command>
     </hudson.tasks.Shell>
     <hudson.tasks.Ant>
       <targets></targets>