Author: cbrisson
Date: Sun Jan 7 07:38:33 2007
New Revision: 493755
URL: http://svn.apache.org/viewvc?view=rev&rev=493755
Log:
fix skip.jar.loading handling for test downloads
Modified:
velocity/tools/trunk/download.xml
Modified: velocity/tools/trunk/download.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/download.xml?view=diff&rev=493755&r1=493754&r2=493755
==============================================================================
--- velocity/tools/trunk/download.xml (original)
+++ velocity/tools/trunk/download.xml Sun Jan 7 07:38:33 2007
@@ -113,17 +113,19 @@
ignoreerrors="false" />
</target>
- <target name="http-test-download" unless="skip.jar.loading">
- <condition property="jar.present">
- <and>
- <isfalse value="${force.jar.loading}"/>
- <available
file="${test.lib.dir}/${download.name}-${download.version}.jar"/>
+ <target name="http-test-download">
+ <condition property="skip-download">
+ <or>
+ <istrue value="${skip.jar.loading}"/>
+ <and>
+ <isfalse value="${force.jar.loading}"/>
+ <available
file="${test.lib.dir}/${download.name}-${download.version}.jar"/>
</and>
</condition>
<antcall target="do-http-test-download"/>
</target>
- <target name="do-http-test-download" unless="jar.present">
+ <target name="do-http-test-download" unless="skip-download">
<!-- set download.path if not set previously -->
<property name="download.path"
value="${download.name}/${download.name}/${download.version}" />
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
