dion 2002/07/11 06:41:03
Modified: . build-bootstrap.xml
Log:
Bootstrap now doesn't copy maven.jar to ${maven.repo.local},
allowing b4 and HEAD to coexist safely.
Revision Changes Path
1.125 +8 -9 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- build-bootstrap.xml 10 Jul 2002 12:56:29 -0000 1.124
+++ build-bootstrap.xml 11 Jul 2002 13:41:03 -0000 1.125
@@ -125,8 +125,6 @@
depends="install"
description="--> Update local jars, generate maven's build system, generate
maven, and setup the distributions.">
- <copy todir="${maven.home}/lib" file="${maven.repo.local}/maven.jar"/>
-
<!-- make sure we run the correct maven script per os -->
<condition property="maven.script" value="maven.bat">
<and>
@@ -152,8 +150,6 @@
<!-- Remove any cruft left in build.dest -->
<delete dir="target"/>
- <!-- Remove the maven.jar from maven.repo.local -->
- <delete file="${maven.repo.local}/maven.jar"/>
</target>
<!-- ================================================================== -->
@@ -175,6 +171,10 @@
<fileset dir="src/plugins"/>
</copy>
+ <mkdir dir="${maven.bootstrap.dir}/maven/lib"/>
+ <copy file="${maven.bootstrap.dir}/maven.jar"
+ todir="${maven.bootstrap.dir}/maven/lib"/>
+
</target>
<!-- ================================================================== -->
@@ -306,15 +306,14 @@
<!--
After we have compiled the classes required to generate
the build system we need to make a temporary bootstrap
- maven.jar file and place it in maven.repo.local so that the generated
+ maven.jar file and place it in maven.home so that the generated
build system will work. Maven expects the presence of
- ${maven.repo.local}/maven.jar and we want to use Maven as it
- is used for any normal project. Later in the build
+ ${maven.home}/lib/maven.jar. Later in the build
process we will replace this bootstrap version of
maven.jar with the completely populated maven.jar.
- -->
+ -->
- <jar jarfile="${maven.repo.local}/maven.jar">
+ <jar jarfile="${maven.bootstrap.dir}/maven.jar">
<fileset dir="${maven.bootstrap.classes}">
<include name="**/*.class"/>
<include name="**/*.properties"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
