Author: aheritier
Date: Tue Jun 19 07:31:34 2007
New Revision: 548738
URL: http://svn.apache.org/viewvc?view=rev&rev=548738
Log:
Fix distribution. Errors committed previously
Modified:
maven/maven-1/core/trunk/maven.xml
Modified: maven/maven-1/core/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/maven.xml?view=diff&rev=548738&r1=548737&r2=548738
==============================================================================
--- maven/maven-1/core/trunk/maven.xml (original)
+++ maven/maven-1/core/trunk/maven.xml Tue Jun 19 07:31:34 2007
@@ -158,12 +158,12 @@
<goal name="maven:build-tar" prereqs="maven:build-install">
<j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
<ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${tag}.tar">
- <ant:tarfileset dir="${installerDir}">
+ <ant:tarfileset dir="${maven.dist.dir}">
<ant:include name="${tag}/**"/>
<ant:exclude name="**/maven"/>
<ant:exclude name="**/install_repo.sh"/>
</ant:tarfileset>
- <ant:tarfileset dir="${installerDir}" mode="755">
+ <ant:tarfileset dir="${maven.dist.dir}" mode="755">
<ant:include name="**/maven"/>
<ant:include name="**/install_repo.sh"/>
</ant:tarfileset>
@@ -177,7 +177,7 @@
</goal>
<goal name="maven:build-zip" prereqs="maven:build-tar">
<ant:zip zipfile="${maven.dist.dir}/${tag}.zip">
- <ant:zipfileset dir="${installerDir}" includes="${tag}/**"/>
+ <ant:zipfileset dir="${maven.dist.dir}" includes="${tag}/**"/>
</ant:zip>
</goal>
<goal name="maven:build-exe" prereqs="maven:build-install">
@@ -274,7 +274,7 @@
${systemScope.setProperty('maven.repo.remote',repoRemote)}
<ant:delete dir="${repoLocal}"/>
<maven:maven
descriptor="src/test/touchstone-build/src/reactor-build/default/project.xml"
goals="java:compile,site"/>
- <ant:mkdir dir="${installerDir}"/>
+ <ant:mkdir dir="${maven.dist.dir}"/>
<ant:tar
tarfile="${maven.dist.dir}/seed-repo-maven-${pom.currentVersion}.tar.gz"
compression="gzip" longfile="gnu">
<ant:tarfileset dir="${repoLocal}">
<j:forEach var="lib" items="${pom.artifacts}">
