You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/06/10 01:44:09 UTC
svn commit: r413193 - in /maven/maven-1/plugins/trunk/dist: plugin.jelly
plugin.properties xdocs/changes.xml xdocs/properties.xml
Author: ltheussl
Date: Fri Jun 9 16:44:08 2006
New Revision: 413193
URL: http://svn.apache.org/viewvc?rev=413193&view=rev
Log:
PR: MPDIST-17
New property maven.dist.formats to allow creation of only zip or tar.gz archives.
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/plugin.properties
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=413193&r1=413192&r2=413193&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Fri Jun 9 16:44:08 2006
@@ -190,73 +190,93 @@
prereqs="dist:build-setup,dist:prepare-bin-filesystem"
description="Build the binary distribution.">
- <!-- Use LF line endings for specified files if lf filter
- is set -->
- <j:if test="${lfFilter.length() > 0}">
- <ant:fixcrlf srcdir="${maven.dist.bin.archive.dir}"
- eol="lf" includes="${lfFilter}"/>
- </j:if>
+ <util:tokenize var="distFormats" delim="," trim="true">${maven.dist.formats}</util:tokenize>
- <!-- Create a tar.gz file -->
- <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
- <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
- </ant:tar>
-
- <ant:gzip
- zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
- src="${maven.dist.dir}/${maven.final.name}.tar"
- />
-
- <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+ <j:forEach var="distFormat" items="${distFormats}">
- <!-- Use CRLF line endings for specified files in zip if crlf filter
- is set -->
- <j:if test="${crlfFilter.length() > 0}">
- <ant:fixcrlf srcdir="${maven.dist.bin.archive.dir}"
- eol="crlf" includes="${crlfFilter}"/>
- </j:if>
+ <j:if test="${distFormat == 'tgz'}">
+ <!-- Use LF line endings for specified files if lf filter
+ is set -->
+ <j:if test="${lfFilter.length() > 0}">
+ <ant:fixcrlf srcdir="${maven.dist.bin.archive.dir}"
+ eol="lf" includes="${lfFilter}"/>
+ </j:if>
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
+ <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:tar>
+
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+ </j:if>
+
+ <j:if test="${distFormat == 'zip'}">
+ <!-- Use CRLF line endings for specified files in zip if crlf filter
+ is set -->
+ <j:if test="${crlfFilter.length() > 0}">
+ <ant:fixcrlf srcdir="${maven.dist.bin.archive.dir}"
+ eol="crlf" includes="${crlfFilter}"/>
+ </j:if>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
+ <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:zip>
+ </j:if>
+
+ </j:forEach>
- <!-- Create a zip file -->
- <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
- <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
- </ant:zip>
</goal>
<goal
name="dist:build-src"
prereqs="dist:build-setup,dist:prepare-src-filesystem"
description="Build the source distribution.">
-
- <!-- Use LF line endings for specified files in unix distros if lf filter
- is set -->
- <j:if test="${lfFilter.length() > 0}">
- <ant:fixcrlf srcdir="${maven.dist.src.archive.dir}"
- eol="lf" includes="${lfFilter}"/>
- </j:if>
- <!-- Create a tar.gz file -->
- <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
- <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
- </ant:tar>
-
- <ant:gzip
- zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
- src="${maven.dist.dir}/${maven.final.name}-src.tar"
- />
-
- <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+ <util:tokenize var="distFormats" delim="," trim="true">${maven.dist.formats}</util:tokenize>
- <!-- Use CRLF line endings for text files in zip archive if crlf filter
- is set -->
- <j:if test="${crlfFilter.length() > 0}">
- <ant:fixcrlf srcdir="${maven.dist.src.archive.dir}"
- eol="crlf" includes="${crlfFilter}"/>
- </j:if>
+ <j:forEach var="distFormat" items="${distFormats}">
- <!-- Create a zip file -->
- <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
- <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
- </ant:zip>
+ <j:if test="${distFormat == 'tgz'}">
+ <!-- Use LF line endings for specified files in unix distros if lf filter
+ is set -->
+ <j:if test="${lfFilter.length() > 0}">
+ <ant:fixcrlf srcdir="${maven.dist.src.archive.dir}"
+ eol="lf" includes="${lfFilter}"/>
+ </j:if>
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
+ <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:tar>
+
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}-src.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+ </j:if>
+
+ <j:if test="${distFormat == 'zip'}">
+ <!-- Use CRLF line endings for text files in zip archive if crlf filter
+ is set -->
+ <j:if test="${crlfFilter.length() > 0}">
+ <ant:fixcrlf srcdir="${maven.dist.src.archive.dir}"
+ eol="crlf" includes="${crlfFilter}"/>
+ </j:if>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
+ <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:zip>
+ </j:if>
+ </j:forEach>
</goal>
@@ -494,33 +514,44 @@
</classpath>
</javadoc>
- <ant:echo>
- +---------------------------------------------+
- | C R E A T I N G B I N A R Y T A R B A L L |
- +---------------------------------------------+
- </ant:echo>
+ <util:tokenize var="distFormats" delim="," trim="true">${maven.dist.formats}</util:tokenize>
- <!-- Create a tar.gz file -->
- <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
- <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
- </ant:tar>
- <ant:gzip
- zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
- src="${maven.dist.dir}/${maven.final.name}.tar"
- />
-
- <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+ <j:forEach var="distFormat" items="${distFormats}">
- <ant:echo>
- +----------------------------------------------+
- | C R E A T I N G B I N A R Y Z I P F I L E |
- +----------------------------------------------+
- </ant:echo>
+ <j:if test="${distFormat == 'tgz'}">
+ <ant:echo>
+ +---------------------------------------------+
+ | C R E A T I N G B I N A R Y T A R B A L L |
+ +---------------------------------------------+
+ </ant:echo>
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
+ <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:tar>
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+ </j:if>
+
+ <j:if test="${distFormat == 'zip'}">
+ <ant:echo>
+ +----------------------------------------------+
+ | C R E A T I N G B I N A R Y Z I P F I L E |
+ +----------------------------------------------+
+ </ant:echo>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
+ <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:zip>
+ </j:if>
+
+ </j:forEach>
- <!-- Create a zip file -->
- <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
- <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
- </ant:zip>
</goal>
@@ -562,34 +593,42 @@
</ant:fileset>
</ant:copy>
- <ant:echo>
-
- +---------------------------------------------+
- | C R E A T I N G S O U R C E T A R B A L L |
- +---------------------------------------------+
- </ant:echo>
+ <util:tokenize var="distFormats" delim="," trim="true">${maven.dist.formats}</util:tokenize>
- <!-- Create a tar.gz file -->
- <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
- <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
- </ant:tar>
- <ant:gzip
- zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
- src="${maven.dist.dir}/${maven.final.name}-src.tar"
- />
-
- <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+ <j:forEach var="distFormat" items="${distFormats}">
- <ant:echo>
- +----------------------------------------------+
- | C R E A T I N G S O U R C E Z I P F I L E |
- +----------------------------------------------+
- </ant:echo>
+ <j:if test="${distFormat == 'tgz'}">
+ <ant:echo>
+ +---------------------------------------------+
+ | C R E A T I N G S O U R C E T A R B A L L |
+ +---------------------------------------------+
+ </ant:echo>
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
+ <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:tar>
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}-src.tar"
+ />
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+ </j:if>
+
+ <j:if test="${distFormat == 'zip'}">
+ <ant:echo>
+ +----------------------------------------------+
+ | C R E A T I N G S O U R C E Z I P F I L E |
+ +----------------------------------------------+
+ </ant:echo>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
+ <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:zip>
+ </j:if>
- <!-- Create a zip file -->
- <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
- <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
- </ant:zip>
+ </j:forEach>
</goal>
<goal
Modified: maven/maven-1/plugins/trunk/dist/plugin.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.properties?rev=413193&r1=413192&r2=413193&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.properties Fri Jun 9 16:44:08 2006
@@ -30,4 +30,5 @@
maven.dist.crlf.filter=**/*.txt
maven.dist.lf.filter=
maven.dist.bin.include.site=true
-maven.dist.bin.artifact.type=jar
\ No newline at end of file
+maven.dist.bin.artifact.type=jar
+maven.dist.formats=zip,tgz
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=413193&r1=413192&r2=413193&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Fri Jun 9 16:44:08 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPDIST-17">New property maven.dist.formats to allow creation of only zip or tar.gz archives.</action>
<action dev="ltheussl" type="add" issue="MPDIST-26">Allow distribution of artifact types other than jar. New property maven.dist.bin.artifact.type, deprecated property maven.dist.bin.artifact.</action>
<action dev="ltheussl" type="add" issue="MPDIST-19">New property <code>maven.dist.bin.include.site</code> to optionally include the site docs in the binary distribution.</action>
<action dev="ltheussl" type="fix" issue="MPDIST-12">build-src goal does not use <code>pom.build.sourceDirectory</code>.</action>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/properties.xml?rev=413193&r1=413192&r2=413193&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/properties.xml Fri Jun 9 16:44:08 2006
@@ -100,7 +100,15 @@
and zip distributions. This filter is applied before the crlf
filter, so in zip archives, the crlf filter will take precendence
for files that satisfy both filters.</td>
- </tr>
+ </tr>
+ <tr>
+ <td>maven.dist.formats</td>
+ <td>yes - default is <code>zip,tgz</code>.</td>
+ <td>
+ A comma-separated list of distribution formats to build.
+ Possible values are tgz and zip.
+ </td>
+ </tr>
</table>
</section>
</body>