Author: aheritier
Date: Tue Jun 19 05:58:38 2007
New Revision: 548712
URL: http://svn.apache.org/viewvc?view=rev&rev=548712
Log:
Add sources distribution when we release m1.
Modified:
maven/maven-1/core/trunk/maven.xml
maven/maven-1/core/trunk/project.properties
maven/maven-1/core/trunk/xdocs/developers/making-releases.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=548712&r1=548711&r2=548712
==============================================================================
--- maven/maven-1/core/trunk/maven.xml (original)
+++ maven/maven-1/core/trunk/maven.xml Tue Jun 19 05:58:38 2007
@@ -50,9 +50,17 @@
</ant:copy>
</goal>
- <goal name="maven:build-install" prereqs="clean,jar:jar"
description="Generates a maven installation.">
+ <goal name="maven:build-init" prereqs="clean" description="Prepare the
environment to create binaries and sources distribibutions.">
<j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
- <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
+ </goal>
+
+ <goal name="maven:build-src" prereqs="maven:build-init,dist:build-src"
description="Generates maven binaries.">
+ <move file="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
tofile="${maven.dist.dir}/${tag}-src.tar.gz"/>
+ <move file="${maven.dist.dir}/${maven.final.name}-src.zip"
tofile="${maven.dist.dir}/${tag}-src.zip"/>
+ </goal>
+
+ <goal name="maven:build-install" prereqs="maven:build-init,jar:jar"
description="Generates a maven installation.">
+ <j:set var="installerDir" value="${maven.dist.dir}/${tag}"/>
<ant:delete dir="${installerDir}"/>
<ant:mkdir dir="${installerDir}"/>
<ant:mkdir dir="${installerDir}/bin"/>
@@ -149,48 +157,54 @@
<goal name="maven:build-tar" prereqs="maven:build-install">
<j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
- <ant:tar longfile="gnu" tarfile="${maven.build.dir}/installer/${tag}.tar">
- <ant:tarfileset dir="${maven.build.dir}/installer">
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${tag}.tar">
+ <ant:tarfileset dir="${installerDir}">
<ant:include name="${tag}/**"/>
<ant:exclude name="**/maven"/>
<ant:exclude name="**/install_repo.sh"/>
</ant:tarfileset>
- <ant:tarfileset dir="${maven.build.dir}/installer" mode="755">
+ <ant:tarfileset dir="${installerDir}" mode="755">
<ant:include name="**/maven"/>
<ant:include name="**/install_repo.sh"/>
</ant:tarfileset>
</ant:tar>
</goal>
<goal name="maven:build-bzip2" prereqs="maven:build-tar">
- <ant:bzip2 zipfile="${maven.build.dir}/installer/${tag}.tar.bz2"
src="${maven.build.dir}/installer/${tag}.tar"/>
+ <ant:bzip2 zipfile="${maven.dist.dir}/${tag}.tar.bz2"
src="${maven.dist.dir}/${tag}.tar"/>
</goal>
<goal name="maven:build-gzip" prereqs="maven:build-tar">
- <ant:gzip zipfile="${maven.build.dir}/installer/${tag}.tar.gz"
src="${maven.build.dir}/installer/${tag}.tar"/>
+ <ant:gzip zipfile="${maven.dist.dir}/${tag}.tar.gz"
src="${maven.dist.dir}/${tag}.tar"/>
</goal>
<goal name="maven:build-zip" prereqs="maven:build-tar">
- <ant:zip zipfile="${maven.build.dir}/installer/${tag}.zip">
- <ant:zipfileset dir="${maven.build.dir}/installer" includes="${tag}/**"/>
+ <ant:zip zipfile="${maven.dist.dir}/${tag}.zip">
+ <ant:zipfileset dir="${installerDir}" includes="${tag}/**"/>
</ant:zip>
</goal>
<goal name="maven:build-exe" prereqs="maven:build-install">
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
<j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
- <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
+ <j:set var="installerDir" value="${maven.dist.dir}/${tag}"/>
<j:set var="maven.nsis.build.dir" value="${installerDir}"/>
<attainGoal name="nsis"/>
- <ant:copy
tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe"
file="${maven.build.dir}/${maven.nsis.final.name}.exe"/>
+ <ant:copy
tofile="${maven.dist.dir}/${pom.artifactId}-${pom.currentVersion}.exe"
file="${maven.build.dir}/${maven.nsis.final.name}.exe"/>
</j:when>
<j:otherwise>
<ant:echo>WARNING: nsis installer not generated. Run again on windows
if needed.</ant:echo>
</j:otherwise>
</j:choose>
</goal>
+
<goal name="maven:installer"
prereqs="maven:build-bzip2,maven:build-gzip,maven:build-zip,maven:build-exe"
- description="Generate maven distributions (zip, tar, exe, ...)">
- <ant:delete file="${maven.build.dir}/installer/${tag}.tar"/>
+ description="Generate maven distributions (zip, tar, exe ...)">
+ <ant:delete file="${maven.dist.dir}/${tag}.tar"/>
</goal>
+ <goal name="maven:distribution" prereqs="maven:build-src,maven:installer"
+ description="Generate maven binaries and sources distributions"/>
+
+ <goal name="maven:release"
prereqs="clean,jar:deploy,source:deploy,javadoc:deploy,maven:distribution"
description="Goals called for a release"/>
+
<goal name="maven:generate-install-scripts" description="Generates
install_repo scripts.">
<j:file name="${maven.build.dir}/install_repo.sh"
omitXmlDeclaration="true">
<j:whitespace>#!/bin/sh
@@ -260,8 +274,8 @@
${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="${maven.build.dir}/installer"/>
- <ant:tar
tarfile="${maven.build.dir}/installer/seed-repo-maven-${pom.currentVersion}.tar.gz"
compression="gzip" longfile="gnu">
+ <ant:mkdir dir="${installerDir}"/>
+ <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}">
<j:set var="dep" value="${lib.dependency}"/>
Modified: maven/maven-1/core/trunk/project.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/project.properties?view=diff&rev=548712&r1=548711&r2=548712
==============================================================================
--- maven/maven-1/core/trunk/project.properties (original)
+++ maven/maven-1/core/trunk/project.properties Tue Jun 19 05:58:38 2007
@@ -20,7 +20,8 @@
#=====
# TODO: remove http://people.apache.org/repo/m1-snapshot-repository/, just
there for SNAPSHOTs
-maven.repo.remote =
http://people.apache.org/repo/m1-snapshot-repository/,http://repo1.maven.org/maven
+#maven.repo.remote =
http://people.apache.org/repo/m1-snapshot-repository/,http://repo1.maven.org/maven
+maven.repo.remote = http://repo1.maven.org/maven
# Repository to deploy to
maven.repo.list=apache.snapshots
@@ -66,6 +67,13 @@
#=====
maven.checkstyle.properties = ${basedir}/checkstyle.xml
maven.checkstyle.header.file = ${basedir}/checkstyle-license.txt
+
+#=====
+# Distribution plugin settings
+#=====
+maven.dist.dir=${maven.build.dir}/distribution/
+maven.dist.src.includes=README*,LICENSE*,NOTICE*,*.properties,*.xml
+maven.dist.include.dirs=xdocs
#=====
# Html2xdoc plugin settings
Modified: maven/maven-1/core/trunk/xdocs/developers/making-releases.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/xdocs/developers/making-releases.xml?view=diff&rev=548712&r1=548711&r2=548712
==============================================================================
--- maven/maven-1/core/trunk/xdocs/developers/making-releases.xml (original)
+++ maven/maven-1/core/trunk/xdocs/developers/making-releases.xml Tue Jun 19
05:58:38 2007
@@ -106,7 +106,7 @@
<p>Run <code>maven scm:prepare-release</code> and enter the
appropriate tag (<code>maven-[major].[minor].[bugfix]</code>) and version.</p>
</li>
<li>
- <p>Produce a clean build using <code>maven
-Dmaven.repo.list=apache.releases -Dmaven.site.deploy.live=true
scm:perform-release</code>. When prompted for the tag, enter the one used in
the previous step. When prompted for the goal, enter
<code>clean,jar:deploy,source:deploy,javadoc:deploy,maven:installer</code>. Do
this on Windows so that the .exe file is generated (you have to install NSIS,
and to setup the NSIS plugin to find the exe). You can find the binaries in
<code>target/checkout/target/installer</code></p>
+ <p>Produce a clean build using <code>maven
-Dmaven.repo.list=apache.releases -Dmaven.site.deploy.live=true
scm:perform-release</code>. When prompted for the tag, enter the one used in
the previous step. When prompted for the goal, enter
<code>maven:release</code>. Do this on Windows so that the .exe file is
generated (you have to install NSIS, and to setup the NSIS plugin to find the
exe). You can find the binaries in
<code>target/checkout/target/distribution</code></p>
</li>
<li>
<p>Sign and create checksums for the binaries :</p>
