dion 2003/10/16 01:46:34
Modified: src/plugins-build/dist plugin.jelly
Log:
- Prefix basedir on copied ant build file
- Only create ant build file if the project has source
- Only copy maven.src.dir if it exists
Revision Changes Path
1.11 +14 -9 maven/src/plugins-build/dist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/dist/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 16 Oct 2003 08:11:03 -0000 1.10
+++ plugin.jelly 16 Oct 2003 08:46:34 -0000 1.11
@@ -4,7 +4,8 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
- xmlns:deploy="deploy">
+ xmlns:deploy="deploy"
+ xmlns:util="jelly:util">
<!-- ================================================================== -->
<!-- D I S T R I B U T I O N S -->
@@ -84,20 +85,24 @@
<j:choose>
<j:when test="${maven.dist.build.xml.avail}">
- <ant:copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
+ <ant:copy todir="${maven.dist.src.assembly.dir}"
file="${basedir}/build.xml"/>
</j:when>
<j:otherwise>
- <attainGoal name="ant:generate-build"/>
- <ant:move
- file="${basedir}/build.xml"
- tofile="${maven.dist.src.assembly.dir}/build.xml"/>
+ <j:if test="${sourcesPresent == 'true'}">
+ <attainGoal name="ant:generate-build"/>
+ <ant:move
+ file="${basedir}/build.xml"
+ tofile="${maven.dist.src.assembly.dir}/build.xml"/>
+ </j:if>
</j:otherwise>
</j:choose>
<!-- Copy Source -->
- <ant:copy todir="${maven.dist.src.assembly.dir}/src">
- <ant:fileset dir="${maven.src.dir}" />
- </ant:copy>
+ <util:available file="${maven.src.dir}">
+ <ant:copy todir="${maven.dist.src.assembly.dir}/src">
+ <ant:fileset dir="${maven.src.dir}" />
+ </ant:copy>
+ </util:available>
</goal>
<goal name="dist"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
