Author: ltheussl
Date: Thu Jan 12 13:32:21 2006
New Revision: 368477
URL: http://svn.apache.org/viewcvs?rev=368477&view=rev
Log:
PR: MPDIST-15
Submitted by: Fabrizio Giustina
New maven.dist.src.include property
Added:
maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt (with props)
maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties (with
props)
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/dist/src/plugin-test/project.xml
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/viewcvs/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=368477&r1=368476&r2=368477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Thu Jan 12 13:32:21 2006
@@ -92,6 +92,8 @@
+-------------------------------------------------------+
</ant:echo>
+ <util:tokenize var="includelist"
delim=",">${maven.dist.src.include}</util:tokenize>
+
<ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir=".">
<ant:include name="README.txt"/>
@@ -100,6 +102,9 @@
<ant:include name="project.properties"/>
<ant:include name="maven.xml"/>
<ant:include name="project.xml"/>
+ <j:forEach items="${includelist}" var="includeitem">
+ <ant:include name="${includeitem}" />
+ </j:forEach>
</ant:fileset>
</ant:copy>
Added: maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt?rev=368477&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt (added)
+++ maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt Thu Jan 12
13:32:21 2006
@@ -0,0 +1 @@
+custom file included in source distribution build
Propchange: maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/plugins/trunk/dist/src/plugin-test/custom.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/maven-1/plugins/trunk/dist/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/src/plugin-test/maven.xml?rev=368477&r1=368476&r2=368477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/dist/src/plugin-test/maven.xml Thu Jan 12
13:32:21 2006
@@ -19,7 +19,7 @@
xmlns:util="jelly:util"
xmlns:j="jelly:core">
- <goal name="testPlugin" prereqs="test-dist">
+ <goal name="testPlugin" prereqs="test-dist,test-maven-dist-src-include">
</goal>
<goal name="test-dist">
@@ -29,4 +29,10 @@
<assert:assertFileExists
file="${maven.dist.dir}/${pom.artifactId}-${pom.currentVersion}${file}"/>
</j:forEach>
</goal>
+
+ <goal name="test-maven-dist-src-include">
+ <attainGoal name="dist:prepare-src-filesystem"/>
+ <assert:assertFileExists file="${maven.dist.src.assembly.dir}/custom.txt"/>
+ </goal>
+
</project>
Added: maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties?rev=368477&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties (added)
+++ maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties Thu Jan
12 13:32:21 2006
@@ -0,0 +1 @@
+maven.dist.src.include=custom.txt,doesntexists.txt
Propchange: maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/maven-1/plugins/trunk/dist/src/plugin-test/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/src/plugin-test/project.xml?rev=368477&r1=368476&r2=368477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/src/plugin-test/project.xml (original)
+++ maven/maven-1/plugins/trunk/dist/src/plugin-test/project.xml Thu Jan 12
13:32:21 2006
@@ -55,4 +55,10 @@
<build>
<sourceDirectory>src/main</sourceDirectory>
</build>
+
+ <!-- avoid running all reports during test -->
+ <reports>
+ <report>maven-license-plugin</report>
+ </reports>
+
</project>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=368477&r1=368476&r2=368477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Thu Jan 12 13:32:21 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="update" issue="MPDIST-15" due-to="Fabrizio
Giustina">New <code>maven.dist.src.include</code> property.</action>
<action dev="aheritier" type="add" issue="MPDIST-27,MPDIST-28"
due-to="Phil Steitz">Allow to configure to which files should use CRLF/LF line
endings in archives.</action>
<action dev="ltheussl" type="fix"
issue="MPDIST-24"><code>dist:prepare-src-filesystem</code> doesn't recognize
<code>maven.ant.generatebuild.file</code>.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update
dependencies to match ones in maven 1.1 core and to unify them between plugins.
The following dependencies are updated :
Modified: maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/properties.xml?rev=368477&r1=368476&r2=368477&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/properties.xml Thu Jan 12 13:32:21
2006
@@ -51,7 +51,12 @@
<td>maven.dist.src.assembly.dir</td>
<td>yes - default is
${maven.dist.assembly.dir}/src/${maven.final.name}</td>
<td>The directory where the sources are copied to so that it can be
archived</td>
- </tr>
+ </tr>
+ <tr>
+ <td>maven.dist.src.include</td>
+ <td>yes</td>
+ <td>Comma delimited list of additional files which should be
included in the source distribution</td>
+ </tr>
<tr>
<td>maven.dist.dir</td>
<td>yes - default is ${maven.build.dir}/distributions</td>
