From 6c89a1087abe9f0ee1f4f9f60db0352d58a603eb Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 9 Jun 2006 23:44:08 +0000
Subject: [PATCH] PR: MPDIST-17 New property maven.dist.formats to allow
 creation of only zip or tar.gz archives.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@413193 13f79535-47bb-0310-9956-ffa450edef68
---
 dist/plugin.jelly         | 241 ++++++++++++++++++++++----------------
 dist/plugin.properties    |   3 +-
 dist/xdocs/changes.xml    |   1 +
 dist/xdocs/properties.xml |  10 +-
 4 files changed, 152 insertions(+), 103 deletions(-)

diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index 3f4bc370..f863b475 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -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>
+    <j:forEach var="distFormat" items="${distFormats}">
 
-    <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 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>
 
-    <!-- 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 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>
+    <util:tokenize var="distFormats" delim="," trim="true">${maven.dist.formats}</util:tokenize>
 
-    <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}">
 
-    <!-- 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: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 zip file -->
-    <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
-      <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
-    </ant:zip>
+        <!-- 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>
+    <util:tokenize var="distFormats" delim="," trim="true">${maven.dist.formats}</util:tokenize>
 
-      +---------------------------------------------+
-      | C R E A T I N G  S O U R C E  T A R B A L L |
-      +---------------------------------------------+
-    </ant:echo>
+    <j:forEach var="distFormat" items="${distFormats}">
 
-    <!-- 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 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>
 
-    <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 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>
 
-    <!-- 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 == '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>
+
+    </j:forEach>
   </goal>
 
   <goal
diff --git a/dist/plugin.properties b/dist/plugin.properties
index 94e99e80..35ff25d3 100644
--- a/dist/plugin.properties
+++ b/dist/plugin.properties
@@ -30,4 +30,5 @@ maven.dist.dir=${maven.build.dir}/distributions
 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
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index 1d66c504..581ccbd6 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -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>
diff --git a/dist/xdocs/properties.xml b/dist/xdocs/properties.xml
index 093ce6a7..4fbbe22e 100644
--- a/dist/xdocs/properties.xml
+++ b/dist/xdocs/properties.xml
@@ -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>