Author: rwhitcomb
Date: Fri Jul 19 23:20:23 2013
New Revision: 1505063
URL: http://svn.apache.org/r1505063
Log:
Using <antversion> condition to check for Ant at least version 1.7.0
(instead of using string tests for each supported version).
This is a little problematic since the <antversion> condition was
introduced in Ant 1.7 (i.e., version 1.6 will fail in a rather ugly
fashion). But, everyone should be running recent versions anyway,
since 1.7 was released in December 2006.
This is a merge of revision 1505062 from branches/2.0.x to trunk.
Modified:
pivot/trunk/ (props changed)
pivot/trunk/build.xml
Propchange: pivot/trunk/
------------------------------------------------------------------------------
Merged /pivot/branches/2.0.x:r1505062
Modified: pivot/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1505063&r1=1505062&r2=1505063&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Fri Jul 19 23:20:23 2013
@@ -89,11 +89,7 @@ limitations under the License.
<fail>
<condition>
<not>
- <or>
- <contains string="${ant.version}" substring="1.7"/>
- <contains string="${ant.version}" substring="1.8"/>
- <contains string="${ant.version}" substring="1.9"/>
- </or>
+ <antversion atleast="1.7.0"/>
</not>
</condition>
<