jvanzyl 02/03/13 20:55:09
Modified: . build-bootstrap.xml build.xml
src/templates/build Control.vm build-maven.xml
build-metrics.xml build.xml
Log:
In a little brainstorming session jeff and i had we decided instead of
making a user generate the build system for each project they are
working we will simply place the maven build files in
${ant.home}/maven
So now you only have to install them once and you're set. So we could make
an ant dist that contained the maven build files or convince the ant people
to include them in the next release :-)
So now you install maven make a your project descriptor and you're
ready to go. In theory at least ;-)
Revision Changes Path
1.30 +6 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build-bootstrap.xml 11 Mar 2002 19:53:10 -0000 1.29
+++ build-bootstrap.xml 14 Mar 2002 04:55:08 -0000 1.30
@@ -86,6 +86,12 @@
<delete dir="${basedir}/bootstrap"/>
+ <copy todir="${ant.home}/maven">
+ <fileset dir="maven"/>
+ </copy>
+
+ <delete dir="maven"/>
+
</target>
<!-- update-jars the hard way when bootstrapping maven
1.13 +15 -15 jakarta-turbine-maven/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 5 Mar 2002 04:58:43 -0000 1.12
+++ build.xml 14 Mar 2002 04:55:08 -0000 1.13
@@ -12,7 +12,7 @@
<!-- Set default values for the build -->
<property file="project.properties" />
<!-- Set default values for the build -->
- <property file="maven/default.properties" />
+ <property file="${ant.home}/maven/default.properties" />
<!-- ================================================================== -->
<!-- J A V A C C -->
@@ -63,59 +63,59 @@
<!-- ================================================================== -->
<target name="maven:site">
- <ant antfile="maven/build-docs.xml" target="site"/>
+ <ant antfile="${ant.home}/maven/build-docs.xml" target="site"/>
</target>
<target name="maven:jar">
- <ant antfile="maven/build-maven.xml" target="jar"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="jar"/>
</target>
<target name="maven:install-jar">
- <ant antfile="maven/build-maven.xml" target="install-jar"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="install-jar"/>
</target>
<target name="maven:env">
- <ant antfile="maven/build-maven.xml" target="env"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="env"/>
</target>
<target name="maven:docs">
- <ant antfile="maven/build-docs.xml" target="docs"/>
+ <ant antfile="${ant.home}/maven/build-docs.xml" target="docs"/>
</target>
<target name="maven:test">
- <ant antfile="maven/build-test.xml" target="test"/>
+ <ant antfile="${ant.home}/maven/build-test.xml" target="test"/>
</target>
<target name="maven:clean">
- <ant antfile="maven/build-maven.xml" target="clean"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="clean"/>
</target>
<target name="maven:metrics">
- <ant antfile="maven/build-metrics.xml" target="metrics"/>
+ <ant antfile="${ant.home}/maven/build-metrics.xml" target="metrics"/>
</target>
<target name="maven:dist">
- <ant antfile="maven/build-maven.xml" target="dist"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="dist"/>
</target>
<target name="maven:deploy-site">
- <ant antfile="maven/build-docs.xml" target="deploy-site"/>
+ <ant antfile="${ant.home}/maven/build-docs.xml" target="deploy-site"/>
</target>
<target name="maven:gump-descriptor">
- <ant antfile="maven/build-maven.xml" target="gump-descriptor"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="gump-descriptor"/>
</target>
<target name="maven:javadocs">
- <ant antfile="maven/build-docs.xml" target="javadocs"/>
+ <ant antfile="${ant.home}/maven/build-docs.xml" target="javadocs"/>
</target>
<target name="maven:compile">
- <ant antfile="maven/build-maven.xml" target="compile"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="compile"/>
</target>
<target name="maven:update-jars">
- <ant antfile="maven/build-maven.xml" target="update-jars"/>
+ <ant antfile="${ant.home}/maven/build-maven.xml" target="update-jars"/>
</target>
<!-- maven:end -->
1.10 +4 -3 jakarta-turbine-maven/src/templates/build/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/Control.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Control.vm 11 Mar 2002 23:43:56 -0000 1.9
+++ Control.vm 14 Mar 2002 04:55:09 -0000 1.10
@@ -48,8 +48,9 @@
## Make our list of build-docs.xml delegators
## -------------------------------------------------------
-#set ($mavenDirectory = "maven")
-$files.mkdir($mavenDirectory)
+#set ($outputDir = "maven")
+#set ($mavenDirectory = "${ant.home}/maven")
+$files.mkdir($outputDir)
## -------------------------------------------------------
## Generate all the maven specific build elements that
@@ -59,7 +60,7 @@
#set ($antBasedir = "..")
#foreach ($buildElement in $buildElements)
-$generator.parse($buildElement,"$mavenDirectory/$buildElement")
+$generator.parse($buildElement,"$outputDir/$buildElement")
#end
## We don't want to overwrite an existing build.xml file
1.4 +1 -1 jakarta-turbine-maven/src/templates/build/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-maven.xml 5 Mar 2002 16:27:18 -0000 1.3
+++ build-maven.xml 14 Mar 2002 04:55:09 -0000 1.4
@@ -177,7 +177,7 @@
depends="compile,jar-resources"
description="o Generates the ${project} JAR file (default)">
- <ant antfile="maven/build-test.xml" target="test"/>
+ <ant antfile="$mavenDirectory/build-test.xml" target="test"/>
<jar
jarfile="${build.dir}/${final.name}.jar"
1.9 +1 -1 jakarta-turbine-maven/src/templates/build/build-metrics.xml
Index: build-metrics.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-metrics.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-metrics.xml 5 Mar 2002 16:27:18 -0000 1.8
+++ build-metrics.xml 14 Mar 2002 04:55:09 -0000 1.9
@@ -10,7 +10,7 @@
<target
name="compile">
- <ant antfile="maven/build-maven.xml" target="compile"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="compile"/>
</target>
<!-- ================================================================== -->
1.21 +15 -15 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 8 Mar 2002 14:23:03 -0000 1.20
+++ build.xml 14 Mar 2002 04:55:09 -0000 1.21
@@ -21,63 +21,63 @@
<!-- ================================================================== -->
<target name="maven:site">
- <ant antfile="maven/build-docs.xml" target="site"/>
+ <ant antfile="$mavenDirectory/build-docs.xml" target="site"/>
</target>
<target name="maven:jar">
- <ant antfile="maven/build-maven.xml" target="jar"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="jar"/>
</target>
<target name="maven:install-jar">
- <ant antfile="maven/build-maven.xml" target="install-jar"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="install-jar"/>
</target>
<target name="maven:env">
- <ant antfile="maven/build-maven.xml" target="env"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="env"/>
</target>
<target name="maven:docs">
- <ant antfile="maven/build-docs.xml" target="docs"/>
+ <ant antfile="$mavenDirectory/build-docs.xml" target="docs"/>
</target>
<target name="maven:test">
- <ant antfile="maven/build-test.xml" target="test"/>
+ <ant antfile="$mavenDirectory/build-test.xml" target="test"/>
</target>
<target name="maven:singletest">
- <ant antfile="maven/build-test.xml" target="run-singletest"/>
+ <ant antfile="$mavenDirectory/build-test.xml" target="run-singletest"/>
</target>
<target name="maven:clean">
- <ant antfile="maven/build-maven.xml" target="clean"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="clean"/>
</target>
<target name="maven:metrics">
- <ant antfile="maven/build-metrics.xml" target="metrics"/>
+ <ant antfile="$mavenDirectory/build-metrics.xml" target="metrics"/>
</target>
<target name="maven:dist">
- <ant antfile="maven/build-maven.xml" target="dist"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="dist"/>
</target>
<target name="maven:deploy-site">
- <ant antfile="maven/build-docs.xml" target="deploy-site"/>
+ <ant antfile="$mavenDirectory/build-docs.xml" target="deploy-site"/>
</target>
<target name="maven:gump-descriptor">
- <ant antfile="maven/build-maven.xml" target="gump-descriptor"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="gump-descriptor"/>
</target>
<target name="maven:javadocs">
- <ant antfile="maven/build-docs.xml" target="javadocs"/>
+ <ant antfile="$mavenDirectory/build-docs.xml" target="javadocs"/>
</target>
<target name="maven:compile">
- <ant antfile="maven/build-maven.xml" target="compile"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="compile"/>
</target>
<target name="maven:update-jars">
- <ant antfile="maven/build-maven.xml" target="update-jars"/>
+ <ant antfile="$mavenDirectory/build-maven.xml" target="update-jars"/>
</target>
<!-- maven:end -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
