mcconnell 2003/06/24 20:10:03
Modified: merlin/merlin-plugin plugin.jelly
Log:
Provide alternative filestes to handle the past /java and new /main source directory
references until we figure out how to translate mavens source path into a sequence of
fileset declarations.
Revision Changes Path
1.14 +30 -10 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 24 Jun 2003 13:36:10 -0000 1.13
+++ plugin.jelly 25 Jun 2003 03:10:03 -0000 1.14
@@ -15,7 +15,7 @@
/>
</define:taglib>
- <taskdef name="meta" classname="org.apache.avalon.meta.tools.ant.MetaTask">
+ <ant:taskdef name="meta" classname="org.apache.avalon.meta.tools.ant.MetaTask">
<classpath>
<pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
<pathelement
path="${plugin.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
@@ -24,20 +24,40 @@
<pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-spi')}"/>
<pathelement path="${plugin.getDependencyPath('avalon:avalon-meta')}"/>
</classpath>
- </taskdef>
+ </ant:taskdef>
<goal name="merlin:meta"
description="Generate meta info descriptors based on meta tags declared in Java
source files for inclusion in a jar file.">
- <mkdir dir="${maven.build.dest}"/>
- <meta destDir="${maven.build.dest}"
+
+ <ant:available property="javaSourcesPresent"
+ file="${maven.src.dir}/java"/>
+
+ <ant:available property="mainSourcesPresent"
+ file="${maven.src.dir}/main"/>
+
+ <ant:mkdir dir="${maven.build.dest}"/>
+ <ant:meta destDir="${maven.build.dest}"
format="${merlin.meta.format}"
force="${merlin.meta.force}"
- postfix="${merlin.meta.type.postfix}"
- >
- <fileset dir="${maven.src.dir}/java">
- <include name="**/*.java"/>
- </fileset>
- </meta>
+ postfix="${merlin.meta.type.postfix}">
+ <!--
+ <ant:src>
+ <ant:path refid="maven.compile.src.set"/>
+ </ant:src>
+ -->
+
+ <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:meta>
</goal>
<goal name="merlin:deploy"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
