Author: sebb
Date: Tue Feb 28 20:47:10 2012
New Revision: 1294820
URL: http://svn.apache.org/viewvc?rev=1294820&view=rev
Log:
Allow override of maven.home via property define
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1294820&r1=1294819&r2=1294820&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Tue Feb 28 20:47:10 2012
@@ -1527,9 +1527,13 @@ run JMeter unless all the JMeter jars ar
<property environment="env"/>
<!-- According to http://maven.apache.org/download.html#Installation
M2_HOME applies to Maven 2.2.1 and 3.0.x -->
<condition property="maven.present">
- <isset property="env.M2_HOME"/>
+ <or>
+ <isset property="env.M2_HOME"/>
+ <isset property="maven.home"/> <!-- Allow override on command-line -->
+ </or>
</condition>
- <fail unless="${maven.present}" message="The environment variable M2_HOME
must point to a Maven installation"/>
+ <fail unless="${maven.present}"
+ message="The environment variable M2_HOME (or property maven.home) must
point to a Maven installation"/>
<property name="maven.home" value="${env.M2_HOME}"/>
