Commit d1a35129 authored by Matt Tucker's avatar Matt Tucker Committed by matt

Support for Ant 1.7

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6595 b35dd754-fafc-0310-a699-88a17e54d16e
parent 4c629fc6
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<!-- <!--
Build Requirements: Build Requirements:
* Ant 1.6 (including optional tasks) * Ant 1.6 or 1.7 (including optional tasks)
* JDK 1.5 * JDK 1.5 or higher
* jUnit in your Ant or Java classpath * jUnit in your Ant or Java classpath
--> -->
...@@ -201,9 +201,13 @@ ...@@ -201,9 +201,13 @@
<target name="init"> <target name="init">
<!-- Check for min build requirements --> <!-- Check for min build requirements -->
<condition property="ant.not.ok" value="true"> <condition property="ant.not.ok" value="true">
<not> <not>
<contains string="${ant.version}" substring="1.6"/> <or>
<contains string="${ant.version}" substring="1.6"/>
<contains string="${ant.version}" substring="1.7"/>
</or>
</not> </not>
</condition> </condition>
<condition property="java.not.ok" value="true"> <condition property="java.not.ok" value="true">
...@@ -211,7 +215,7 @@ ...@@ -211,7 +215,7 @@
<contains string="${ant.java.version}" substring="1.5"/> <contains string="${ant.java.version}" substring="1.5"/>
</not> </not>
</condition> </condition>
<fail if="ant.not.ok" message="Must use Ant 1.6.x to build Wildfire"/> <fail if="ant.not.ok" message="Must use Ant 1.6.x or 1.7.x to build Wildfire"/>
<fail if="java.not.ok" message="Must use JDK 1.5.x to build Wildfire"/> <fail if="java.not.ok" message="Must use JDK 1.5.x to build Wildfire"/>
<tstamp/> <tstamp/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment