You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/03/27 14:13:03 UTC
cvs commit: maven/src/plugins-build/dist plugin.jelly
dion 2003/03/27 05:13:03
Modified: src/plugins-build/dist plugin.jelly
Log:
Explicity use ant name space. In prep for removal of jeez etc
Revision Changes Path
1.4 +74 -68 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 26 Jan 2003 22:34:03 -0000 1.3
+++ plugin.jelly 27 Mar 2003 13:13:03 -0000 1.4
@@ -2,6 +2,7 @@
<project
xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:m="maven">
@@ -10,12 +11,18 @@
<!-- D I S T R I B U T I O N S -->
<!-- ================================================================== -->
- <property name="maven.dist.assembly.dir" value="${maven.build.dir}/${maven.final.name}"/>
- <property name="maven.dist.bin.archive.dir" value="${maven.dist.assembly.dir}/bin"/>
- <property name="maven.dist.src.archive.dir" value="${maven.dist.assembly.dir}/src"/>
- <property name="maven.dist.bin.assembly.dir" value="${maven.dist.assembly.dir}/bin/${maven.final.name}"/>
- <property name="maven.dist.src.assembly.dir" value="${maven.dist.assembly.dir}/src/${maven.final.name}"/>
- <property name="maven.dist.dir" value="${maven.build.dir}/distributions"/>
+ <ant:property name="maven.dist.assembly.dir"
+ value="${maven.build.dir}/${maven.final.name}"/>
+ <ant:property name="maven.dist.bin.archive.dir"
+ value="${maven.dist.assembly.dir}/bin"/>
+ <ant:property name="maven.dist.src.archive.dir"
+ value="${maven.dist.assembly.dir}/src"/>
+ <ant:property name="maven.dist.bin.assembly.dir"
+ value="${maven.dist.assembly.dir}/bin/${maven.final.name}"/>
+ <ant:property name="maven.dist.src.assembly.dir"
+ value="${maven.dist.assembly.dir}/src/${maven.final.name}"/>
+ <ant:property name="maven.dist.dir"
+ value="${maven.build.dir}/distributions"/>
<goal
name="dist:prepare-bin-filesystem"
@@ -29,37 +36,37 @@
-->
- <delete dir="${maven.dist.bin.assembly.dir}"/>
- <mkdir dir="${maven.dist.bin.assembly.dir}"/>
+ <ant:delete dir="${maven.dist.bin.assembly.dir}"/>
+ <ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
- <echo>
+ <ant: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>
+ </ant:echo>
- <copy todir="${maven.dist.bin.assembly.dir}">
- <fileset dir=".">
- <include name="README.txt"/>
- <include name="LICENSE*"/>
- </fileset>
- </copy>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="README.txt"/>
+ <ant:include name="LICENSE*"/>
+ </ant:fileset>
+ </ant:copy>
<!-- Copy Jars -->
- <copy todir="${maven.dist.bin.assembly.dir}">
- <fileset dir="${maven.build.dir}">
- <include name="${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="${maven.build.dir}">
+ <ant:include name="${maven.final.name}.jar"/>
+ </ant:fileset>
+ </ant:copy>
<!-- Copy documentation -->
<j:set var="docsDest"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
- <copy todir="${maven.dist.bin.assembly.dir}/docs">
- <fileset dir="${docsDest}">
- <include name="**"/>
- </fileset>
- </copy>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
+ <ant:fileset dir="${docsDest}">
+ <ant:include name="**"/>
+ </ant:fileset>
+ </ant:copy>
</goal>
<goal
@@ -68,45 +75,44 @@
<!-- 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}" />
+ <ant:delete dir="${maven.dist.src.assembly.dir}" />
+ <ant:mkdir dir="${maven.dist.src.assembly.dir}" />
- <echo>
+ <ant: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>
+ </ant:echo>
- <copy todir="${maven.dist.src.assembly.dir}">
- <fileset dir=".">
- <include name="README.txt"/>
- <include name="LICENSE*"/>
- <include name="project.properties"/>
- <include name="maven.xml"/>
- <include name="project.xml"/>
- </fileset>
- </copy>
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="README.txt"/>
+ <ant:include name="LICENSE*"/>
+ <ant:include name="project.properties"/>
+ <ant:include name="maven.xml"/>
+ <ant:include name="project.xml"/>
+ </ant:fileset>
+ </ant:copy>
- <available property="maven.dist.build.xml.avail"
+ <ant: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"/>
+ <ant:copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
</j:when>
<j:otherwise>
<attainGoal name="ant:generate-build"/>
- <move
+ <ant: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">
- <fileset dir="${maven.src.dir}">
- </fileset>
- </copy>
+ <ant:copy todir="${maven.dist.src.assembly.dir}/src">
+ <ant:fileset dir="${maven.src.dir}" />
+ </ant:copy>
</goal>
<goal name="dist"
@@ -123,8 +129,8 @@
<goal
name="dist:build-setup"
description="Set up directories for a distribution build">
- <delete dir="${maven.dist.dir}"/>
- <mkdir dir="${maven.dist.dir}"/>
+ <ant:delete dir="${maven.dist.dir}"/>
+ <ant:mkdir dir="${maven.dist.dir}"/>
</goal>
<goal
@@ -133,21 +139,21 @@
description="Build the binary distribution.">
<!-- Create a tar.gz file -->
- <tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
- <tarfileset dir="${maven.dist.bin.archive.dir}"/>
- </tar>
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
+ <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:tar>
- <gzip
+ <ant:gzip
zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
src="${maven.dist.dir}/${maven.final.name}.tar"
/>
- <delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
<!-- Create a zip file -->
- <zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
- <zipfileset dir="${maven.dist.bin.archive.dir}"/>
- </zip>
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
+ <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:zip>
</goal>
<goal
@@ -156,21 +162,21 @@
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.src.archive.dir}"/>
- </tar>
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
+ <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:tar>
- <gzip
+ <ant:gzip
zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
src="${maven.dist.dir}/${maven.final.name}-src.tar"
/>
- <delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
<!-- Create a zip file -->
- <zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
- <zipfileset dir="${maven.dist.src.archive.dir}"/>
- </zip>
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
+ <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:zip>
</goal>
@@ -192,9 +198,9 @@
<attainGoal name="dist:build"/>
- <tar tarfile="distributions.tar" basedir="${maven.dist.dir}"/>
- <gzip zipfile="distributions.tar.gz" src="distributions.tar"/>
- <delete file="distributions.tar"/>
+ <ant:tar tarfile="distributions.tar" basedir="${maven.dist.dir}"/>
+ <ant:gzip zipfile="distributions.tar.gz" src="distributions.tar"/>
+ <ant:delete file="distributions.tar"/>
<deploy:artifact
artifact="distributions.tar.gz"
@@ -247,7 +253,7 @@
<m:user-check user="${maven.username}"/>
<j:set var="maven.final.name" value="${snapshotSignature}"/>
- <echo>Building snapshot distribution: ${maven.final.name}</echo>
+ <ant:echo>Building snapshot distribution: ${maven.final.name}</ant:echo>
<attainGoal name="dist:deploy"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org