commit f2ea9087154a3823c1b03f6f9a9013b61eb9dc22
author Borislav Kapukaranov <b.kapukaranov@gmail.com> Thu Aug 23 19:11:14 2012 +0300
committer Borislav Kapukaranov <b.kapukaranov@gmail.com> Thu Aug 23 19:22:38 2012 +0300
tree 3164d915c0dc720ed12805d4f005d2b0c3bcb08d
parent 046abbcef06935f936f6ba4ebab0b25b831032b6

387886 - Fixes trouble with the shared integration repo while building a single Virgo repo, not the whole chain

common/common.properties

diff --git a/common/common.properties b/common/common.properties
index 05cba97..ca179db 100644
--- a/common/common.properties
+++ b/common/common.properties
@@ -7,6 +7,7 @@
 build.stamp=BUILD-${timestamp}
 bundle.version=${version}.${build.stamp}
 local.repo.dir=${java.io.tmpdir}/local-repository
+virgo.deps.location=ivy-cache
 
 # Artifact Properties
 main.java.dir=${basedir}/src/main/java

common/common.xml

diff --git a/common/common.xml b/common/common.xml
index 39dd5f5..4922917 100644
--- a/common/common.xml
+++ b/common/common.xml
@@ -139,10 +139,14 @@
 					<include name="*.java"/>
 				</fileset>
 			</resourcecount>
-		</condition>
+        </condition>
+        
+        <!-- init the property containing the ivy-cache and the integration repo location placeholders -->
         <delete file="${basedir}/../user-ivy.properties"/>
-        <echo file="${basedir}/../user-ivy.properties"
-        message="ivy.cache=${ivy.cache.dir}&#xa;integration.repo.dir=${integration.repo.dir}&#xa;"/>
+        <condition property="virgo.deps.path" value="${integration.repo.dir}" else="${ivy.cache.dir}/repository">
+            <equals arg1="${virgo.deps.location}" arg2="integration-repo"/>
+        </condition>
+        <echo file="${basedir}/../user-ivy.properties" message="ivy.cache=${ivy.cache.dir}&#xa;integration.repo.dir=${virgo.deps.path}&#xa;"/> 
 	</target>
 
 	<target name="diagnostics" description="diagnostics">
@@ -178,6 +182,7 @@
 				<arg value="-Dci.build=${ci.build}"/>
 				<arg value="-Dtimestamp=${timestamp}"/>
 				<arg value="-Dbundle.version=${bundle.version}"/>
+                <arg value="-Dvirgo.deps.location=${virgo.deps.location}"/>
 				<arg value="${exec-args}"/>
 			</exec>
 			<exec executable="${virgo.build.dir}\common\runant.bat" dir="${basedir}"
@@ -187,6 +192,7 @@
 				<arg value="-Dci.build=${ci.build}"/>
 				<arg value="-Dtimestamp=${timestamp}"/>
 				<arg value="-Dbundle.version=${bundle.version}"/>
+                <arg value="-Dvirgo.deps.location=${virgo.deps.location}"/>
 				<arg value="${exec-args}"/>
 			</exec>
 			<echo>exec-ant for target '${exec-ant-target}' gave return code ${exec-ant-rc}</echo>