make cache dir configurable via system property (FELIX-1595)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@815205 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bldcommon/common.xml b/sigil/bldcommon/common.xml
index cfe3508..6193bf4 100644
--- a/sigil/bldcommon/common.xml
+++ b/sigil/bldcommon/common.xml
@@ -24,6 +24,7 @@
<property file="${common.dir}/sigil-defaults.properties" prefix="default."/>
<property file="${common.dir}/build.properties"/>
+ <echo>${cache.dir}</echo>
<!-- =====================================================
stuff intended to be over-ridden is prefixed with my.
=====================================================-->
@@ -314,7 +315,7 @@
<isset property="env.SIGIL_HOME" />
</condition>
- <property name="sigil.home" value="${common.dir}/../cache/ant" />
+ <property name="sigil.home" value="${cache.dir}/ant" />
<property name="sigil.jar.dir" value="${sigil.home}/lib" />
<property name="ivy.jar.file" value="${sigil.jar.dir}/ivy.jar" />
<property name="sigil.jar.file" value="${sigil.jar.dir}/sigil-ivy-plugin.jar" />
diff --git a/sigil/bldcommon/ivysettings.xml b/sigil/bldcommon/ivysettings.xml
index e11ec78..d5c18d8 100644
--- a/sigil/bldcommon/ivysettings.xml
+++ b/sigil/bldcommon/ivysettings.xml
@@ -18,7 +18,7 @@
under the License.
-->
<ivysettings>
- <properties file="${ivy.settings.dir}/build.properties"/>
+ <properties file="${ivy.settings.dir}/build.properties" override="false"/>
<caches defaultCacheDir="${cache.dir}/all" />
<settings defaultResolver="default" circularDependencyStrategy="error" />
@@ -58,7 +58,6 @@
<ivy pattern="${repository.dir}/shared/${repository.pattern}" />
<artifact pattern="${repository.dir}/shared/${repository.pattern}" />
</filesystem>
-
</chain>
<url name="eclipse">