evenisse 2003/09/08 02:15:20
Modified: src/plugins-build/plugin plugin.jelly
src/plugins-build/plugin/xdocs changes.xml
Log:
Fixed MAVEN-791. Check if project is a plugin.
Revision Changes Path
1.14 +20 -4 maven/src/plugins-build/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 31 Aug 2003 07:43:28 -0000 1.13
+++ plugin.jelly 8 Sep 2003 09:15:20 -0000 1.14
@@ -1,13 +1,29 @@
<?xml version="1.0"?>
<project
+ xmlns:ant="jelly:ant"
xmlns:http="jelly:http"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
+
+ <goal name="plugin:check" description="Check if project is a plugin">
+ <u:file var="projectFile"
+ name="${basedir}/project.xml" />
+ <u:file var="jellyFile"
+ name="${basedir}/plugin.jelly" />
+ <j:if test="${!projectFile.exists()}">
+ <j:set var="notPlugin" value="true"/>
+ </j:if>
+ <j:if test="${!pluginFile.exists()}">
+ <j:set var="notPlugin" value="true"/>
+ </j:if>
+ <ant:fail if="notPlugin">This project is a non-plugin project.</ant:fail>
+ </goal>
- <goal name="plugin" description="Build a plugin jar and install to the
maven.repo.local">
+ <goal name="plugin" prereqs="plugin:check"
+ description="Build a plugin jar and install to the maven.repo.local">
<!-- Plugins are just a jar. -->
<attainGoal name="jar:jar"/>
@@ -68,7 +84,7 @@
<!-- generate a skeletal navigation.xml for the plugin specified
by the 'plugin' variable -->
- <goal name="plugin:generate-navigation"
+ <goal name="plugin:generate-navigation" prereqs="plugin:check"
description="Generate navigation.xml for the plugin">
<j:set var="skip" value="false" />
@@ -88,7 +104,7 @@
</goal>
<!-- generate a skeletal goals.xml for the plugin specified -->
- <goal name="plugin:generate-goals"
+ <goal name="plugin:generate-goals" prereqs="plugin:check"
description="Generate goals.xml for the plugin">
<j:set var="skip" value="false" />
@@ -128,7 +144,7 @@
</goal>
<!-- generate properties documentation -->
- <goal name="plugin:generate-properties"
+ <goal name="plugin:generate-properties" prereqs="plugin:check"
description="Generate properties.xml for the plugin">
1.2 +3 -0 maven/src/plugins-build/plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 28 Aug 2003 09:16:54 -0000 1.1
+++ changes.xml 8 Sep 2003 09:15:20 -0000 1.2
@@ -8,6 +8,9 @@
<body>
<release version="1.1" date="in CVS">
<action dev="evenisse" type="fix">
+ Fixed MAVEN-791. Check if project is a plugin.
+ </action>
+ <action dev="evenisse" type="fix">
Fixed MAVEN-708. Fix the goals description generation if there is no
plugin.jelly file.
</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
