felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsav...@apache.org
Subject svn commit: r815205 - in /felix/trunk/sigil/bldcommon: common.xml ivysettings.xml
Date Tue, 15 Sep 2009 08:11:02 GMT
Author: dsavage
Date: Tue Sep 15 08:11:02 2009
New Revision: 815205

URL: http://svn.apache.org/viewvc?rev=815205&view=rev
Log:
make cache dir configurable via system property (FELIX-1595)

Modified:
    felix/trunk/sigil/bldcommon/common.xml
    felix/trunk/sigil/bldcommon/ivysettings.xml

Modified: felix/trunk/sigil/bldcommon/common.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/common.xml?rev=815205&r1=815204&r2=815205&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/common.xml (original)
+++ felix/trunk/sigil/bldcommon/common.xml Tue Sep 15 08:11:02 2009
@@ -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" />

Modified: felix/trunk/sigil/bldcommon/ivysettings.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/ivysettings.xml?rev=815205&r1=815204&r2=815205&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/ivysettings.xml (original)
+++ felix/trunk/sigil/bldcommon/ivysettings.xml Tue Sep 15 08:11:02 2009
@@ -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">



Mime
View raw message