dion 2003/10/16 01:11:03
Modified: src/plugins-build/dist plugin.properties plugin.jelly
Log:
Move properties to plugin.properties
Prefix ant build file with basedir for reactored build
Revision Changes Path
1.4 +6 -0 maven/src/plugins-build/dist/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/dist/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 28 Jan 2003 03:55:53 -0000 1.3
+++ plugin.properties 16 Oct 2003 08:11:03 -0000 1.4
@@ -4,3 +4,9 @@
# Distribution plugin.
# -------------------------------------------------------------------
+maven.dist.assembly.dir=${maven.build.dir}/${maven.final.name}
+maven.dist.bin.archive.dir=${maven.dist.assembly.dir}/bin
+maven.dist.src.archive.dir=${maven.dist.assembly.dir}/src
+maven.dist.bin.assembly.dir=${maven.dist.assembly.dir}/bin/${maven.final.name}
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}
+maven.dist.dir=${maven.build.dir}/distributions
1.10 +1 -14 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 29 Aug 2003 06:27:53 -0000 1.9
+++ plugin.jelly 16 Oct 2003 08:11:03 -0000 1.10
@@ -10,19 +10,6 @@
<!-- D I S T R I B U T I O N S -->
<!-- ================================================================== -->
- <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"
prereqs="xdoc:init, jar:jar, javadoc:generate"
@@ -102,7 +89,7 @@
<j:otherwise>
<attainGoal name="ant:generate-build"/>
<ant:move
- file="build.xml"
+ file="${basedir}/build.xml"
tofile="${maven.dist.src.assembly.dir}/build.xml"/>
</j:otherwise>
</j:choose>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
