glennm 2002/07/11 11:14:26
Modified: src/plugins/dist plugin.jelly
Log:
Glenn McAllister - 2002/07/11
- Fixed up the dist plugin so the binary dist actually has the jar files.
Separate file system images for src and bin are created before
tarring/zipping them up.
- The layout and format of the resulting .tar.gz and .zip files remains the
same.
Revision Changes Path
1.9 +52 -26 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 10 Jul 2002 13:50:00 -0000 1.8
+++ plugin.jelly 11 Jul 2002 18:14:26 -0000 1.9
@@ -10,13 +10,20 @@
<!-- ================================================================== -->
<property name="maven.dist.assembly.dir"
value="${maven.build.dir}/${maven.final.name}"/>
+ <property name="maven.dist.bin.assembly.dir"
value="${maven.dist.assembly.dir}/bin"/>
+ <property name="maven.dist.src.assembly.dir"
value="${maven.dist.assembly.dir}/src"/>
<property name="maven.dist.dir" value="${maven.build.dir}/distributions"/>
<goal
name="dist:prepare-filesystem"
- prereqs="java:jar,javadoc:generate"
- description="Builds the distribution file system ready to be zipped up">
+ prereqs="dist:prepare-bin-filesystem,dist:prepare-src-filesystem"
+ description="Builds the binary and source distribution file system ready to be
zipped up">
+ </goal>
+ <goal
+ 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
@@ -24,8 +31,8 @@
-->
- <delete dir="${maven.dist.assembly.dir}"/>
- <mkdir dir="${maven.dist.assembly.dir}"/>
+ <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 -->
@@ -36,9 +43,9 @@
</echo>
<!-- Copy the project descriptor -->
- <copy todir="${maven.dist.assembly.dir}" file="project.xml"/>
+ <copy todir="${maven.dist.bin.assembly.dir}" file="project.xml"/>
- <copy todir="${maven.dist.assembly.dir}">
+ <copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir=".">
<include name="README.txt"/>
<include name="LICENSE"/>
@@ -49,40 +56,46 @@
</copy>
<!-- Copy Jars -->
- <copy todir="${maven.dist.assembly.dir}">
+ <copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir="${maven.build.dir}">
<include name="**/*.jar"/>
</fileset>
</copy>
<!-- Copy documentation -->
- <copy todir="${maven.dist.assembly.dir}/docs">
+ <copy todir="${maven.dist.bin.assembly.dir}/docs">
<fileset dir="${maven.docs.dest}">
<include name="**"/>
</fileset>
</copy>
+ </goal>
- <delete dir="${maven.dist.dir}"/>
- <mkdir dir="${maven.dist.dir}"/>
+ <goal
+ name="dist:prepare-src-filesystem"
+ prereqs="dist:prepare-bin-filesystem"
+ description="Builds the source distribution file system.">
<!-- S O U R C E D I S T R I B U T I O N -->
+ <delete dir="${maven.dist.src.assembly.dir}" />
+ <mkdir dir="${maven.dist.src.assembly.dir}" />
+
<echo>
+-------------------------------------------------------+
| C R E A T I N G S O U R C E D I S T R I B U T I O N |
+-------------------------------------------------------+
</echo>
- <delete>
- <fileset dir="${maven.dist.assembly.dir}">
- <include name="**/*.jar"/>
+ <copy todir="${maven.dist.src.assembly.dir}">
+ <fileset dir="${maven.dist.bin.assembly.dir}">
+ <exclude name="**/*.jar" />
</fileset>
- </delete>
+ </copy>
- <copy todir="${maven.dist.assembly.dir}" file="build.xml"/>
+ <copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
<!-- Copy Source -->
- <copy todir="${maven.dist.assembly.dir}/src">
+ <copy todir="${maven.dist.src.assembly.dir}/src">
<fileset dir="${maven.src.dir}">
<include name="**/*.java"/>
<include name="**/*.xml"/>
@@ -93,14 +106,24 @@
<goal
name="dist:build"
- prereqs="dist:prepare-filesystem"
- description="Build a distribution">
+ prereqs="dist:build-setup,dist:build-bin,dist:build-src"
+ description="Build a complete distribution.">
+ </goal>
+
+ <goal
+ name="dist:build-setup">
+ <delete dir="${maven.dist.dir}"/>
+ <mkdir dir="${maven.dist.dir}"/>
+ </goal>
+
+ <goal
+ name="dist:build-bin"
+ prereqs="dist:prepare-bin-filesystem"
+ description="Build the binary distribution.">
- <!-- binary tarballs -->
-
<!-- Create a tar.gz file -->
<tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
- <tarfileset dir="${maven.dist.assembly.dir}"/>
+ <tarfileset dir="${maven.dist.bin.assembly.dir}"/>
</tar>
<gzip
@@ -112,15 +135,18 @@
<!-- Create a zip file -->
<zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
- <zipfileset dir="${maven.dist.assembly.dir}"/>
+ <zipfileset dir="${maven.dist.bin.assembly.dir}"/>
</zip>
+ </goal>
-
- <!-- source tarballs -->
+ <goal
+ name="dist:build-src"
+ prereqs="dist:prepare-src-filesystem"
+ description="Build the source distribution.">
<!-- Create a tar.gz file -->
<tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
- <tarfileset dir="${maven.dist.assembly.dir}"/>
+ <tarfileset dir="${maven.dist.src.assembly.dir}"/>
</tar>
<gzip
@@ -132,7 +158,7 @@
<!-- Create a zip file -->
<zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
- <zipfileset dir="${maven.dist.assembly.dir}"/>
+ <zipfileset dir="${maven.dist.src.assembly.dir}"/>
</zip>
</goal>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
