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 00:39:51 UTC
svn commit: r413185 - in /maven/maven-1/plugins/trunk/dist: plugin.jelly
plugin.properties xdocs/changes.xml xdocs/properties.xml
Author: ltheussl
Date: Fri Jun 9 15:39:50 2006
New Revision: 413185
URL: http://svn.apache.org/viewvc?rev=413185&view=rev
Log:
PR: MPDIST-19
New property maven.dist.bin.include.site to optionally include the site docs in the binary distribution.
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=413185&r1=413184&r2=413185&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Fri Jun 9 15:39:50 2006
@@ -34,7 +34,7 @@
<goal
name="dist:prepare-bin-filesystem"
- prereqs="xdoc:init, jar:jar, site:generate"
+ prereqs="jar:jar"
description="Builds the binary distribution file system.">
<!--
@@ -68,6 +68,17 @@
</ant:fileset>
</ant:copy>
+ <!-- Delete any previously generated documentation -->
+ <ant:delete dir="${maven.docs.dest}"/>
+ <j:set var="includeSite" value="${maven.dist.bin.include.site}"/>
+ <j:choose>
+ <j:when test="${includeSite}">
+ <attainGoal name="site"/>
+ </j:when>
+ <j:otherwise>
+ <attainGoal name="javadoc"/>
+ </j:otherwise>
+ </j:choose>
<!-- Copy documentation -->
<j:set var="docsDest" value="${maven.docs.dest}"/>
<ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
Modified: maven/maven-1/plugins/trunk/dist/plugin.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.properties?rev=413185&r1=413184&r2=413185&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.properties Fri Jun 9 15:39:50 2006
@@ -29,3 +29,4 @@
maven.dist.bin.artifact=${maven.final.name}.jar
maven.dist.crlf.filter=**/*.txt
maven.dist.lf.filter=
+maven.dist.bin.include.site=true
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=413185&r1=413184&r2=413185&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Fri Jun 9 15:39:50 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <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>
<action dev="aheritier" type="update">Fix compatibility with the version of ant plugin newer or equal to 1.10.</action>
<action dev="ltheussl" type="update" issue="MPDIST-15" due-to="Fabrizio Giustina">New <code>maven.dist.src.include</code> property.</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=413185&r1=413184&r2=413185&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/properties.xml Fri Jun 9 15:39:50 2006
@@ -66,7 +66,15 @@
<td>maven.dist.bin.artifact</td>
<td>yes - default is <code>${maven.final.name}.jar</code>.</td>
<td>The name of the binary artifact to include in distribution, relative to target dir.</td>
- </tr>
+ </tr>
+ <tr>
+ <td>maven.dist.bin.include.site</td>
+ <td>yes - default is <code>true</code>.</td>
+ <td>
+ Whether to run <code>maven site</code> and include the site docs in the binary distribution, or not.
+ If set to <code>false</code>, only the javadocs will be included.
+ </td>
+ </tr>
<tr>
<td>maven.dist.crlf.filter</td>
<td>yes - default is <code>"**/*.txt"</code>.</td>