svn commit: r720355 - /maven/components/branches/maven-2.1.x/build.xml

[jd...@apache.org]

Author: jdcasey
Date: Mon Nov 24 15:51:02 2008
New Revision: 720355

URL: http://svn.apache.org/viewvc?rev=720355&view=rev
Log:
finally it seems to work.

Modified:
    maven/components/branches/maven-2.1.x/build.xml

Modified: maven/components/branches/maven-2.1.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=720355&r1=720354&r2=720355&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Mon Nov 24 15:51:02 2008
@@ -37,13 +37,14 @@
   
   <property name="it.workdir.version" value="2.1.x"/>
 
-  <target name="initTaskDefs">
+  <target name="initTaskDefs" unless="taskdefs.inited">
   	<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"/>
   </target>
 
-  <target name="isMavenHomeSet">
+  <target name="isMavenHomeSet" depends="initTaskDefs">
     <property environment="env"/>
     <condition property="maven.home" value="${env.M2_HOME}">
       <isset property="env.M2_HOME"/>
@@ -51,7 +52,7 @@
     <fail unless="maven.home" message="You must set the M2_HOME environment variable or specify a maven.home property to this Ant script"/>
   </target>
   
-  <target name="pre-init" depends="initTaskDefs">
+  <target name="read-pom" depends="initTaskDefs" unless="pom.version">
     <copy file="pom.xml" tofile="dependencies.xml"/>
     <replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
     <replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
@@ -59,7 +60,7 @@
     <delete file="${basedir}/dependencies.xml"/>
   </target>
 
-  <target name="init" depends="pre-init, isMavenHomeSet">
+  <target name="init" depends="isMavenHomeSet">
     <xmlproperty prefix="pom" file="pom.xml"/>    
     <basename file="${maven.home}" property="maven.home.basename"/>
     <dirname file="${maven.home}" property="maven.home.dirname"/>
@@ -76,7 +77,7 @@
     <delete dir="bootstrap"/>
   </target>
 
-  <target name="pull" depends="init" unless="skip.pull">    
+  <target name="pull" depends="init, read-pom" unless="skip.pull">    
     <property name="verbose" value="false"/>    
     <!-- Pull the dependencies that Maven needs to build -->
     <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
@@ -252,7 +253,7 @@
 
   <target name="with-its" depends="all,run-its"/>
   
-  <target name="set-temp-maven-home" depends="pre-init">
+  <target name="set-temp-maven-home" depends="read-pom">
     <property name="maven.home" value="${java.io.tmpdir}/apache-maven-${pom.version}"/>
     <echo>Using temporary maven install directory: ${maven.home}</echo>
   </target>