glennm 2002/07/12 14:14:57
Modified: src/plugins/dist plugin.jelly
Log:
Glenn McAllister - 2002/07/12
- Tidied up some of the file copying.
- The only jar explcitly copied into the binary distribution is now
${maven.final.name}.jar. Previously, any .jar file in ${maven.build.dir} was
copied over.
- When creating the src distribution, if there isn't a build.xml file one is
created by attaining the ant:generate-build goal.
NOTE: This does introduce a dependency on the ant plugin, which may or may
not be a good thing.
Revision Changes Path
1.10 +18 -9 jakarta-turbine-maven/src/plugins/dist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/dist/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 11 Jul 2002 18:14:26 -0000 1.9
+++ plugin.jelly 12 Jul 2002 21:14:57 -0000 1.10
@@ -24,6 +24,7 @@
name="dist:prepare-bin-filesystem"
prereqs="java:jar,javadoc:generate"
description="Builds the binary distribution file system.">
+
<!--
This is the directory where everything is copied to so that it can
@@ -34,31 +35,26 @@
<delete dir="${maven.dist.bin.assembly.dir}"/>
<mkdir dir="${maven.dist.bin.assembly.dir}"/>
- <!-- B I N A R Y D I S T R I B U T I O N -->
-
<echo>
+-------------------------------------------------------+
| C R E A T I N G B I N A R Y D I S T R I B U T I O N |
+-------------------------------------------------------+
</echo>
- <!-- Copy the project descriptor -->
- <copy todir="${maven.dist.bin.assembly.dir}" file="project.xml"/>
-
<copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir=".">
<include name="README.txt"/>
- <include name="LICENSE"/>
- <include name="LICENSE.txt"/>
+ <include name="LICENSE*"/>
<include name="project.properties"/>
<include name="maven.xml"/>
+ <include name="project.xml"/>
</fileset>
</copy>
<!-- Copy Jars -->
<copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir="${maven.build.dir}">
- <include name="**/*.jar"/>
+ <include name="${maven.final.name}.jar"/>
</fileset>
</copy>
@@ -92,7 +88,20 @@
</fileset>
</copy>
- <copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
+ <available property="maven.dist.build.xml.avail"
+ file="${basedir}/build.xml"/>
+
+ <j:choose>
+ <j:when test="${maven.dist.build.xml.avail}">
+ <copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
+ </j:when>
+ <j:otherwise>
+ <attainGoal name="ant:generate-build"/>
+ <move
+ file="build.xml"
+ tofile="${maven.dist.src.assembly.dir}/build.xml"/>
+ </j:otherwise>
+ </j:choose>
<!-- Copy Source -->
<copy todir="${maven.dist.src.assembly.dir}/src">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
