You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/13 19:59:27 UTC
svn commit: r676382 - /maven/components/trunk/build.xml
Author: jvanzyl
Date: Sun Jul 13 10:59:26 2008
New Revision: 676382
URL: http://svn.apache.org/viewvc?rev=676382&view=rev
Log:
o make sure the distribution is removed and the new distribution laid down properly
Modified:
maven/components/trunk/build.xml
Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=676382&r1=676381&r2=676382&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Sun Jul 13 10:59:26 2008
@@ -49,7 +49,12 @@
<xmlproperty prefix="pom" file="pom.xml"/>
<basename file="${maven.home}" property="maven.home.basename"/>
<dirname file="${maven.home}" property="maven.home.dirname"/>
+ <!-- Initialize properties -->
<property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
+ <property name="maven.assembly" location="maven-distribution/target/${maven.home.basename.expected}-bin.zip"/>
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <property name="surefire.useFile" value="true"/>
+ <echo>maven.home = ${maven.home}</echo>
</target>
<target name="clean-bootstrap" description="cleans up generated bootstrap classes">
@@ -57,11 +62,7 @@
</target>
<target name="pull" depends="init" unless="skip.pull">
- <property name="verbose" value="false"/>
-
- <!-- Initialize properties -->
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="surefire.useFile" value="true"/>
+ <property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
<replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
@@ -158,12 +159,12 @@
</java>
</target>
- <target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
+ <target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
+
<echo>
The new Maven distribution was created as part of the MAVEN-COMPILE step, above.
This goal just validates the presence of that distribution.
</echo>
- <property name="maven.assembly" location="maven-distribution/target/${maven.home.basename.expected}-bin.zip"/>
<condition property="build.failed">
<not>
<available file="${maven.assembly}"/>
@@ -175,17 +176,8 @@
<target name="extract-assembly" depends="init,maven-assembly" description="extracts the maven assembly into maven.home">
<echo>Extracting assembly to ${maven.home.dirname} ...</echo>
<!-- If we are starting from scratch make sure the directory is created -->
+ <delete dir="${maven.home}"/>
<mkdir dir="${maven.home}"/>
- <!-- Deleting the contents inside maven.home allow one to use symlinks for maven.home and still have this work. -->
- <delete>
- <fileset dir="${maven.home}">
- <include name="bin"/>
- <include name="boot"/>
- <include name="conf"/>
- <include name="lib"/>
- <include name="*.txt"/>
- </fileset>
- </delete>
<unzip src="${maven.assembly}" dest="${maven.home.dirname}"/>
<chmod perm="+x">
<fileset dir="${maven.home}/bin">