Author: sebb
Date: Tue Sep 27 08:37:52 2011
New Revision: 1176277
URL: http://svn.apache.org/viewvc?rev=1176277&view=rev
Log:
Add check for Ant version (1.7.0+ required for mapper, used in download_jars)
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=1176277&r1=1176276&r2=1176277&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Tue Sep 27 08:37:52 2011
@@ -1057,7 +1057,14 @@ run JMeter unless all the JMeter jars ar
</jar>
</target>
- <!-- Check that the 3rd party libraries are present -->
+ <!-- Check the Ant version -->
+ <available property="Ant-1.7.0-or-later"
classname="org.apache.tools.ant.types.ResourceCollection"/>
+
+ <target name="_message_Ant" unless="Ant-1.7.0-or-later">
+ <fail message="This build requires Ant 1.7.0 or later"/>
+ </target>
+
+ <!-- Check that the 3rd party libraries are present -->
<target name="_check_3rdparty">
<condition property="3rdparty.present">
<and>
@@ -2102,6 +2109,7 @@ run JMeter unless all the JMeter jars ar
<patternset>
<include name="**/${ent}"/>
</patternset>
+ <!-- This requires Ant 1.7.0 or later -->
<mapper type="flatten"/>
</unzip>
<antcall target="_checkMD5">
@@ -2196,7 +2204,7 @@ run JMeter unless all the JMeter jars ar
</target>
<!-- Download all missing jars.-->
- <target name="download_jars" description="Download any missing jar files">
+ <target name="download_jars" description="Download any missing jar files"
depends="_message_Ant">
<!-- build.dir may be needed as a temporary work area -->
<mkdir dir="${build.dir}" />
<antcall target="_process_all_jars">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
