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/13 19:45:19 UTC
svn commit: r413939 - in /maven/maven-1/plugins/trunk/dist: plugin.jelly
xdocs/changes.xml xdocs/properties.xml
Author: ltheussl
Date: Tue Jun 13 10:45:19 2006
New Revision: 413939
URL: http://svn.apache.org/viewvc?rev=413939&view=rev
Log:
PR: MPDIST-14
New property maven.dist.include.dirs to include additional directories.
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
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=413939&r1=413938&r2=413939&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Tue Jun 13 10:45:19 2006
@@ -110,6 +110,17 @@
<ant:include name="**"/>
</ant:fileset>
</ant:copy>
+
+ <!-- Copy additional directories. -->
+ <util:tokenize var="includedirs" delim=",">${maven.dist.include.dirs}</util:tokenize>
+ <j:forEach items="${includedirs}" var="includedir">
+ <util:available file="${includedir}">
+ <ant:copy todir="${maven.dist.bin.assembly.dir}/${includedir}">
+ <ant:fileset dir="${includedir}" />
+ </ant:copy>
+ </util:available>
+ </j:forEach>
+
</goal>
<goal
@@ -169,6 +180,17 @@
<ant:fileset dir="${pom.build.sourceDirectory}" />
</ant:copy>
</util:available>
+
+ <!-- Copy additional directories. -->
+ <util:tokenize var="includedirs" delim=",">${maven.dist.include.dirs}</util:tokenize>
+ <j:forEach items="${includedirs}" var="includedir">
+ <util:available file="${includedir}">
+ <ant:copy todir="${maven.dist.src.assembly.dir}/${includedir}">
+ <ant:fileset dir="${includedir}" />
+ </ant:copy>
+ </util:available>
+ </j:forEach>
+
</goal>
<goal name="dist"
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=413939&r1=413938&r2=413939&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Tue Jun 13 10:45:19 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPDIST-14">New property maven.dist.include.dirs to include additional directories.</action>
<action dev="ltheussl" type="fix" issue="MPDIST-11">Parent project is not included in source distribution.</action>
<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>
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=413939&r1=413938&r2=413939&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/properties.xml Tue Jun 13 10:45:19 2006
@@ -58,6 +58,14 @@
<td>Comma delimited list of additional files which should be included in the source distribution</td>
</tr>
<tr>
+ <td>maven.dist.include.dirs</td>
+ <td>yes</td>
+ <td>
+ Comma separated list of directories (relative to ${basedir}) that will be
+ included recursively in the distributions.
+ </td>
+ </tr>
+ <tr>
<td>maven.dist.dir</td>
<td>yes - default is ${maven.build.dir}/distributions</td>
<td>The target directory that the final archive is placed in</td>