svn commit: r725359 - /maven/components/branches/maven-2.0.10-RC/build.xml

[be...@apache.org]

Author: bentmann
Date: Wed Dec 10 09:48:14 2008
New Revision: 725359

URL: http://svn.apache.org/viewvc?rev=725359&view=rev
Log:
o Made sure the bootstrap picks up the right Maven distro (it apparently doesn't matter which mvn script you call, if M2_HOME it set, that's the one it goes for)

Modified:
    maven/components/branches/maven-2.0.10-RC/build.xml

Modified: maven/components/branches/maven-2.0.10-RC/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/build.xml?rev=725359&r1=725358&r2=725359&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/build.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/build.xml Wed Dec 10 09:48:14 2008
@@ -20,7 +20,7 @@
 <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   
   <target name="initTaskDefs" unless="taskdefs.inited">
-  	<xmlproperty file="pom.xml" prefix="pom.xml" />
+    <xmlproperty file="pom.xml" prefix="pom.xml" />
     <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/>
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath"/>
     <property name="taskdefs.inited" value="true"/>
@@ -37,6 +37,7 @@
       <isset property="env.M2_HOME"/>
     </condition>
     <fail unless="maven.home" message="You must set the M2_HOME environment variable or specify a maven.home property to this Ant script"/>
+    <echo>Using Maven home at: ${maven.home}</echo>
   </target>
 
   <target name="read-poms" depends="initTaskDefs,initLocalRepo" unless="pom.version">
@@ -214,11 +215,13 @@
   <target name="its-win32" if="its.win32">
     <echo>Retrieving integration tests</echo>
     <exec failonerror="true" dir="${basedir}/${itPom.artifactId}" executable="cmd">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="process-resources"/>
     </exec>
     <exec failonerror="true" dir="${basedir}/${itPom.artifactId}/target/classes" executable="cmd">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="package"/>
@@ -227,6 +230,7 @@
     <echo>Running integration tests</echo>
     <!-- Using java.io.tmpdir to avoid long path names that will make windows scream. -->
     <exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}" executable="cmd">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="-Prun-its"/>
@@ -238,16 +242,18 @@
   <target name="its-unix" if="its.unix">
     <echo>Retrieving integration tests</echo>
     <exec failonerror="true" dir="${basedir}/${itPom.artifactId}" executable="${maven.home}/bin/mvn">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="process-resources"/>
     </exec>
     <exec failonerror="true" dir="${basedir}/${itPom.artifactId}/target/classes" executable="${maven.home}/bin/mvn">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="package"/>
     </exec>
     
     <echo>Running integration tests</echo>
-    <echo>maven.home is: ${maven.home}</echo>
     <!-- Using java.io.tmpdir to avoid long path names that will make windows scream. -->
     <exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}" executable="${maven.home}/bin/mvn">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="-Prun-its"/>
       <arg value="clean"/>
       <arg value="install"/>