kaz 2003/01/25 08:42:51
Modified: src/plugins-build/javadoc plugin.jelly
src/plugins-build/xdoc plugin.jelly
Log:
Fixing the javadoc plugin. It assumed the maven.gen.docs directory
already existed. As a result, 'maven javadoc' would fail if it didn't
already exist. Rather than doing yet another <mkdir> in the javadoc
plugin, I've created an xdoc:init goal that creates the directories.
Any plugin that requires the use of those directories should make this
goal a prereq. I'll be going through all of the plugins to make this
change.
Revision Changes Path
1.3 +1 -0 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 24 Jan 2003 14:09:57 -0000 1.2
+++ plugin.jelly 25 Jan 2003 16:42:51 -0000 1.3
@@ -14,6 +14,7 @@
<goal name="javadoc" prereqs="maven-javadoc-plugin:report"/>
<goal name="maven-javadoc-plugin:report"
+ prereqs="xdoc:init"
description="Generate API documentation">
<j:if test="${sourcesPresent == 'true'}">
1.2 +16 -5 jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:44:59 -0000 1.1
+++ plugin.jelly 25 Jan 2003 16:42:51 -0000 1.2
@@ -195,8 +195,17 @@
prereqs="xdoc:generate-from-pom, xdoc:transform"
description="Generate html project documentation xdoc sources"/>
+ <goal name="xdoc:init"
+ description="Generates the directory structure required for xdocs">
+
+ <mkdir dir="${maven.gen.docs}"/>
+ <mkdir dir="${maven.docs.dest}"/>
+
+ </goal>
+
<goal
name="xdoc:generate-from-pom"
+ prereqs="xdoc:init"
description="Generates xdocs for site based on project descriptor">
<echo>Generating xdocs from POM ... </echo>
@@ -210,8 +219,6 @@
<j:useBean var="escape" class="org.apache.velocity.anakia.Escape"/>
<j:useBean var="files" class="org.apache.velocity.texen.util.FileUtil"/>
- <mkdir dir="${maven.gen.docs}"/>
-
<j:forEach var="pomDocument" items="${pomDocuments}">
<velocity:merge
@@ -231,6 +238,7 @@
<!-- validate xdocs -->
<goal name="xdoc:validate" prereqs="pom:taglib"
description="Validate xdocs match the schema">
+
<available file="${maven.docs.src}" type="dir"
property="maven.docs.src.available"/>
@@ -257,6 +265,7 @@
<!-- copy resources needed for xdocs -->
<goal name="xdoc:copy-resources"
+ prereqs="xdoc:init"
description="copy static resources for use in xdocs generated html">
<!-- Read in the ui properties. -->
@@ -307,7 +316,9 @@
<!-- copy user resources -->
<goal name="xdoc:copy-user-resources"
+ prereqs="xdoc:init"
description="Copy user provided resources to docs destination">
+
<j:if test="${maven.docs.src.available}">
<available file="${maven.docs.src}/images" type="dir"
@@ -355,14 +366,13 @@
<!-- ================================================================== -->
<goal name="xdoc:transform"
+ prereqs="xdoc:init"
description="Generate html project documentation xdoc sources">
<tstamp>
<format property="mavenCurrentYear" pattern="yyyy"/>
</tstamp>
- <mkdir dir="${maven.docs.dest}"/>
-
<!-- Use jelly utils here -->
<available
@@ -399,7 +409,8 @@
</tstamp>
</goal>
- <goal name="xdoc:jelly-transform" prereqs="xdoc:jelly-init"
+ <goal name="xdoc:jelly-transform"
+ prereqs="xdoc:init, xdoc:jelly-init"
description="transform xdocs using jelly/jsl rather than dvsl">
<j:set var="destdir" value="${maven.docs.dest}"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
