You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/01/18 00:23:24 UTC
cvs commit: avalon/meta/plugin plugin.jelly
mcconnell 2004/01/17 15:23:24
Modified: meta/plugin plugin.jelly
Log:
Updatre the script to eliminate errors when executing avalon:meta on a project without source content. Path contributed by bbasilio@deetc.isel.ipl.pt.
Revision Changes Path
1.9 +43 -36 avalon/meta/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 20 Nov 2003 22:19:20 -0000 1.8
+++ plugin.jelly 17 Jan 2004 23:23:24 -0000 1.9
@@ -24,46 +24,53 @@
<goal name="avalon:meta"
description="Generate meta info descriptors based on meta tags declared in Java source files for inclusion in a jar file.">
- <ant:available property="javaSourcesPresent"
- file="${maven.src.dir}/java"/>
+ <j:choose>
+ <j:when test="${sourcesPresent == 'true'}">
- <ant:available property="mainSourcesPresent"
- file="${maven.src.dir}/main"/>
+ <ant:available property="javaSourcesPresent"
+ file="${maven.src.dir}/java"/>
- <ant:available property="testSourcesPresent"
- file="${maven.src.dir}/test"/>
+ <ant:available property="mainSourcesPresent"
+ file="${maven.src.dir}/main"/>
- <ant:mkdir dir="${maven.build.dest}"/>
- <ant:avalon destDir="${maven.build.dest}"
- format="${avalon.meta.format}"
- force="${avalon.meta.force}"
- postfix="${avalon.meta.type.postfix}">
-
- <j:if test="${javaSourcesPresent == 'true'}">
- <ant:fileset dir="${maven.src.dir}/java">
- <include name="**/*.java"/>
- </ant:fileset>
+ <ant:available property="testSourcesPresent"
+ file="${maven.src.dir}/test"/>
+
+ <ant:mkdir dir="${maven.build.dest}"/>
+ <ant:avalon destDir="${maven.build.dest}"
+ format="${avalon.meta.format}"
+ force="${avalon.meta.force}"
+ postfix="${avalon.meta.type.postfix}">
+
+ <j:if test="${javaSourcesPresent == 'true'}">
+ <ant:fileset dir="${maven.src.dir}/java">
+ <include name="**/*.java"/>
+ </ant:fileset>
+ </j:if>
+ <j:if test="${mainSourcesPresent == 'true'}">
+ <ant:fileset dir="${maven.src.dir}/main">
+ <include name="**/*.java"/>
+ </ant:fileset>
+ </j:if>
+
+ </ant:avalon>
+
+ <j:if test="${testSourcesPresent == 'true'}">
+ <ant:mkdir dir="${maven.build.dir}/test-classes"/>
+ <ant:avalon destDir="${maven.build.dir}/test-classes"
+ format="${avalon.meta.format}"
+ force="${avalon.meta.force}"
+ postfix="${avalon.meta.type.postfix}">
+ <ant:fileset dir="${maven.src.dir}/test">
+ <include name="**/*.java"/>
+ </ant:fileset>
+ </ant:avalon>
</j:if>
- <j:if test="${mainSourcesPresent == 'true'}">
- <ant:fileset dir="${maven.src.dir}/main">
- <include name="**/*.java"/>
- </ant:fileset>
- </j:if>
-
- </ant:avalon>
-
- <j:if test="${testSourcesPresent == 'true'}">
- <ant:mkdir dir="${maven.build.dir}/test-classes"/>
- <ant:avalon destDir="${maven.build.dir}/test-classes"
- format="${avalon.meta.format}"
- force="${avalon.meta.force}"
- postfix="${avalon.meta.type.postfix}">
- <ant:fileset dir="${maven.src.dir}/test">
- <include name="**/*.java"/>
- </ant:fileset>
- </ant:avalon>
- </j:if>
-
+ </j:when>
+ <j:otherwise>
+ <ant:echo>No Avalon Meta java source files to compile.</ant:echo>
+ </j:otherwise>
+ </j:choose>
</goal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org