dobbs 02/03/14 14:23:35
Modified: . build-bootstrap.xml build.xml
jakarta-turbine-maven.xml
src/templates/build Control.vm build-maven.xml
build.init.target
Log:
changing ${ant.home}/maven to ${maven.home}
define ${maven.home} in your ~/build.properties
and you're good to go.
Revision Changes Path
1.32 +1 -1 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build-bootstrap.xml 14 Mar 2002 10:45:07 -0000 1.31
+++ build-bootstrap.xml 14 Mar 2002 22:23:35 -0000 1.32
@@ -86,7 +86,7 @@
<delete dir="${basedir}/bootstrap"/>
- <copy todir="${ant.home}/maven">
+ <copy todir="${maven.home}">
<fileset dir="maven"/>
</copy>
1.15 +14 -14 jakarta-turbine-maven/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 14 Mar 2002 07:18:29 -0000 1.14
+++ build.xml 14 Mar 2002 22:23:35 -0000 1.15
@@ -61,59 +61,59 @@
<!-- ================================================================== -->
<target name="maven:site">
- <ant antfile="${ant.home}/maven/build-docs.xml" target="site"/>
+ <ant antfile="${maven.home}/build-docs.xml" target="site"/>
</target>
<target name="maven:jar">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="jar"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
</target>
<target name="maven:install-jar">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="install-jar"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
</target>
<target name="maven:env">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="env"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="env"/>
</target>
<target name="maven:docs">
- <ant antfile="${ant.home}/maven/build-docs.xml" target="docs"/>
+ <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
</target>
<target name="maven:test">
- <ant antfile="${ant.home}/maven/build-test.xml" target="test"/>
+ <ant antfile="${maven.home}/build-test.xml" target="test"/>
</target>
<target name="maven:clean">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="clean"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
</target>
<target name="maven:metrics">
- <ant antfile="${ant.home}/maven/build-metrics.xml" target="metrics"/>
+ <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
</target>
<target name="maven:dist">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="dist"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
</target>
<target name="maven:deploy-site">
- <ant antfile="${ant.home}/maven/build-docs.xml" target="deploy-site"/>
+ <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
</target>
<target name="maven:gump-descriptor">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="gump-descriptor"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
</target>
<target name="maven:javadocs">
- <ant antfile="${ant.home}/maven/build-docs.xml" target="javadocs"/>
+ <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
</target>
<target name="maven:compile">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="compile"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
</target>
<target name="maven:update-jars">
- <ant antfile="${ant.home}/maven/build-maven.xml" target="update-jars"/>
+ <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
</target>
<!-- maven:end -->
1.8 +1 -1 jakarta-turbine-maven/jakarta-turbine-maven.xml
Index: jakarta-turbine-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jakarta-turbine-maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jakarta-turbine-maven.xml 28 Feb 2002 23:38:32 -0000 1.7
+++ jakarta-turbine-maven.xml 14 Mar 2002 22:23:35 -0000 1.8
@@ -2,7 +2,7 @@
<description>Project Management Tools</description>
<url href="http://jakarta.apache.org/turbine/maven/"/>
- <cvs repository="jakarta"/>
+ <cvs repository=""/>
<project name="jakarta-turbine-maven">
1.11 +1 -1 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Control.vm 14 Mar 2002 04:55:09 -0000 1.10
+++ Control.vm 14 Mar 2002 22:23:35 -0000 1.11
@@ -49,7 +49,7 @@
## -------------------------------------------------------
#set ($outputDir = "maven")
-#set ($mavenDirectory = "${ant.home}/maven")
+#set ($mavenDirectory = "${maven.home}")
$files.mkdir($outputDir)
## -------------------------------------------------------
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-maven.xml 14 Mar 2002 20:02:20 -0000 1.5
+++ build-maven.xml 14 Mar 2002 22:23:35 -0000 1.6
@@ -259,7 +259,7 @@
</fileset>
</delete>
- <copy todir="${distDir}" file="default.properties"/>
+ <copy todir="${distDir}" file="${maven.home}/default.properties"/>
<copy todir="${distDir}" file="build.xml"/>
<!-- Copy Source -->
@@ -356,27 +356,27 @@
<target
name="metrics">
- <ant antfile="build-metrics.xml"/>
+ <ant antfile="${maven.home}/build-metrics.xml"/>
</target>
<target
name="test">
- <ant antfile="build-test.xml"/>
+ <ant antfile="${maven.home}/build-test.xml"/>
</target>
<target
name="docs">
- <ant antfile="build-docs.xml"/>
+ <ant antfile="${maven.home}/build-docs.xml"/>
</target>
<target
name="javadocs">
- <ant antfile="build-docs.xml" target="javadocs"/>
+ <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
</target>
<target
name="deploy-site">
- <ant antfile="build-docs.xml" target="deploy-site"/>
+ <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
</target>
</project>
1.8 +1 -1 jakarta-turbine-maven/src/templates/build/build.init.target
Index: build.init.target
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.init.target,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.init.target 14 Mar 2002 07:34:14 -0000 1.7
+++ build.init.target 14 Mar 2002 22:23:35 -0000 1.8
@@ -60,7 +60,7 @@
<project-properties projectDescriptor="project.xml"/>
<!-- Set default values for the build -->
- <property file="${ant.home}/maven/default.properties" />
+ <property file="${maven.home}/default.properties" />
<echo>
name ------------> ${name}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
