Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-06 16:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

o Made bootstrapper fully respect user-supplied maven home directory, including the final directory name

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@942430 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-05-08 18:04:28 +00:00
parent acd6b3c1c0
commit d66682c37d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.xml
View File

@ -58,17 +58,15 @@ END SNIPPET: ant-bootstrap -->
<target name="init" depends="isMavenHomeSet"> <target name="init" depends="isMavenHomeSet">
<xmlproperty prefix="pom" file="pom.xml" /> <xmlproperty prefix="pom" file="pom.xml" />
<dirname file="${maven.home}" property="maven.home.dirname" />
<!-- Initialize properties --> <!-- Initialize properties -->
<property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}" /> <property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}" />
<property name="maven.home.effective" location="${maven.home.dirname}/${maven.home.basename.expected}" />
<property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip" /> <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip" />
<property name="maven.repo.local" value="${user.home}/.m2/repository" /> <property name="maven.repo.local" value="${user.home}/.m2/repository" />
<property name="maven.debug" value="-e" /> <property name="maven.debug" value="-e" />
<property name="maven.test.skip" value="false" /> <property name="maven.test.skip" value="false" />
<property name="surefire.useFile" value="true" /> <property name="surefire.useFile" value="true" />
<property name="maven.test.redirectTestOutputToFile" value="${surefire.useFile}" /> <property name="maven.test.redirectTestOutputToFile" value="${surefire.useFile}" />
<echo>maven.home = ${maven.home.effective}</echo> <echo>maven.home = ${maven.home}</echo>
<echo>maven.repo.local = ${maven.repo.local}</echo> <echo>maven.repo.local = ${maven.repo.local}</echo>
</target> </target>
@ -232,13 +230,15 @@ This goal just validates the presence of that distribution.
</target> </target>
<target name="extract-assembly" depends="init,maven-assembly" description="extracts the maven assembly into maven.home"> <target name="extract-assembly" depends="init,maven-assembly" description="extracts the maven assembly into maven.home">
<echo>Extracting assembly to ${maven.home.dirname} ...</echo> <echo>Extracting assembly to ${maven.home} ...</echo>
<!-- If we are starting from scratch make sure the directory is created --> <!-- If we are starting from scratch make sure the directory is created -->
<delete dir="${maven.home.effective}" /> <delete dir="${maven.home}" />
<mkdir dir="${maven.home.effective}" /> <mkdir dir="${maven.home}" />
<unzip src="${maven.assembly}" dest="${maven.home.dirname}" /> <unzip src="${maven.assembly}" dest="${maven.home}">
<mapper type="regexp" from="^[^\\/]+[\\/](.*)$$" to="\1" />
</unzip>
<chmod perm="+x"> <chmod perm="+x">
<fileset dir="${maven.home.effective}/bin"> <fileset dir="${maven.home}/bin">
<include name="mvn" /> <include name="mvn" />
</fileset> </fileset>
</chmod> </chmod>