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

[jd...@apache.org]

Author: jdcasey
Date: Tue Nov 25 17:45:48 2008
New Revision: 720704

URL: http://svn.apache.org/viewvc?rev=720704&view=rev
Log:
updating for consistency with other branches.

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=720704&r1=720703&r2=720704&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/build.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/build.xml Tue Nov 25 17:45:48 2008
@@ -19,8 +19,6 @@
 
 <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   
-  <property name="it.workdir.version" value="2.0.10-RC"/>
-
   <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"/>
@@ -45,10 +43,14 @@
     <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;"/>
-    <artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
+    <artifact:pom file="${basedir}/dependencies.xml" id="pom">
+      <localRepository path="${maven.repo.local}"/>
+    </artifact:pom>
     <delete file="${basedir}/dependencies.xml"/>
     
-    <artifact:pom file="${basedir}/maven-integration-tests/pom.xml" id="itPom"/>
+    <artifact:pom file="${basedir}/maven-integration-tests/pom.xml" id="itPom">
+      <localRepository path="${maven.repo.local}"/>
+    </artifact:pom>
   </target>
 
   <target name="init" depends="isMavenHomeSet">
@@ -211,12 +213,12 @@
   
   <target name="its-win32" if="its.win32">
     <echo>Retrieving integration tests</echo>
-    <exec dir="${basedir}/maven-integration-tests" executable="cmd">
+    <exec dir="${basedir}/${itPom.artifactId}" executable="cmd">
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="process-resources"/>
     </exec>
-    <exec dir="${basedir}/maven-integration-tests/target/classes" executable="cmd">
+    <exec dir="${basedir}/${itPom.artifactId}/target/classes" executable="cmd">
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="package"/>
@@ -224,7 +226,7 @@
     
     <echo>Running integration tests</echo>
     <!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream. -->
-    <exec failonerror="true" dir="/tmp/maven-integration-tests-${it.workdir.version}" executable="cmd">
+    <exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}" executable="cmd">
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="-Prun-its"/>
@@ -235,16 +237,16 @@
 
   <target name="its-unix" if="its.unix">
     <echo>Retrieving integration tests</echo>
-    <exec dir="${basedir}/maven-integration-tests" executable="${maven.home}/bin/mvn">
+    <exec dir="${basedir}/${itPom.artifactId}" executable="${maven.home}/bin/mvn">
       <arg value="process-resources"/>
     </exec>
-    <exec dir="${basedir}/maven-integration-tests/target/classes" executable="${maven.home}/bin/mvn">
+    <exec dir="${basedir}/${itPom.artifactId}/target/classes" executable="${maven.home}/bin/mvn">
       <arg value="package"/>
     </exec>
     
     <echo>Running integration tests</echo>
     <!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream. -->
-    <exec failonerror="true" dir="/tmp/${itPom.artifactId}-${itPom.version}" executable="${maven.home}/bin/mvn">
+    <exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}" executable="${maven.home}/bin/mvn">
       <arg value="-Prun-its"/>
       <arg value="clean"/>
       <arg value="install"/>