svn commit: r491790 - in /velocity/tools/trunk: build.properties download.xml

[cb...@apache.org]

Author: cbrisson
Date: Tue Jan  2 05:06:53 2007
New Revision: 491790

URL: http://svn.apache.org/viewvc?view=rev&rev=491790
Log:
consistent behaviour for skip.jar.loading and force.jar.loading (VELTOOLS-72)

Modified:
    velocity/tools/trunk/build.properties
    velocity/tools/trunk/download.xml

Modified: velocity/tools/trunk/build.properties
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/build.properties?view=diff&rev=491790&r1=491789&r2=491790
==============================================================================
--- velocity/tools/trunk/build.properties (original)
+++ velocity/tools/trunk/build.properties Tue Jan  2 05:06:53 2007
@@ -88,6 +88,10 @@
 #repo.url= http://www.ibiblio.org/maven
 repo.url= http://mirrors.ibiblio.org/pub/mirrors/maven2
 
+# Skip or force downloading of dependencies
+skip.jar.loading= false
+force.jar.loading= false
+
 # Jars to be downloaded for compilation
 #
 jar.antlr.version= 2.7.2

Modified: velocity/tools/trunk/download.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/download.xml?view=diff&rev=491790&r1=491789&r2=491790
==============================================================================
--- velocity/tools/trunk/download.xml (original)
+++ velocity/tools/trunk/download.xml Tue Jan  2 05:06:53 2007
@@ -72,17 +72,20 @@
 
   <!--  Basic Download Tasks -->
 
-  <target name="http-download" unless="skip.jar.loading">
-    <condition property="jar.present">
-      <and>
-        <isfalse value="${force.jar.loading}"/>
-        <available file="${lib.dir}/${download.name}-${download.version}.jar"/>
-      </and>
+  <target name="http-download">
+    <condition property="skip-download">
+      <or>
+        <istrue value="${skip.jar.loading}"/>
+        <and>
+          <isfalse value="${force.jar.loading}"/>
+          <available file="${lib.dir}/${download.name}-${download.version}.jar"/>
+        </and>
+      </or>
     </condition>
     <antcall target="do-http-download"/>
   </target>
 
-  <target name="do-http-download" unless="jar.present">
+  <target name="do-http-download" unless="skip-download">
     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
     <get src="${repo.url}/${download.path}/${download.name}-${download.version}.jar"
          dest="${lib.dir}/${download.name}-${download.version}.jar"