jvanzyl 2002/07/07 10:44:07
Modified: . build-bootstrap.xml
Log:
o Removing all references to lib.repo and moving to maven.repo.local.
Revision Changes Path
1.117 +35 -35 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build-bootstrap.xml 6 Jul 2002 04:49:10 -0000 1.116
+++ build-bootstrap.xml 7 Jul 2002 17:44:07 -0000 1.117
@@ -40,23 +40,23 @@
<!-- properties defined in order for the bootstrap to work -->
<!-- correctly: -->
<!-- -->
- <!-- ${lib.repo} : Local JAR repository -->
+ <!-- ${maven.repo.local} : Local JAR repository
-->
<!-- ${maven.home}: Maven installation directory -->
<!-- ================================================================== -->
<target
name="check-properties"
- depends="check-maven-home,check-lib-repo">
+ depends="check-maven-home,check-maven-repo-local">
</target>
<target
- name="check-lib-repo"
- unless="lib.repo">
+ name="check-maven-repo-local"
+ unless="maven.repo.local">
<fail>
+------------------------------------------------------------------
| ERROR!
|
- | You must set ${lib.repo} in your ${user.home}/build.properties
+ | You must set ${maven.repo.local} in your ${user.home}/build.properties
|
| Please refer to the bootstrap document:
| http://jakarta.apache.org/turbine/maven/bootstrap.html
@@ -82,8 +82,8 @@
<!-- ================================================================== -->
<!-- C L E A N B O O T S T R A P -->
<!-- ================================================================== -->
- <!-- Remove the contents of ${maven.home} and ${lib.repo} to make -->
- <!-- sure that the any bootstrap changes are working. This target -->
+ <!-- Remove the contents of ${maven.home} and ${maven.repo.local} to -->
+ <!-- make sure that the any bootstrap changes are working. This target -->
<!-- should be used in conjuction with a clean checkout to make -->
<!-- sure that everything is cool with the boostrap process. -->
<!-- ================================================================== -->
@@ -92,24 +92,24 @@
name="clean-bootstrap">
<delete dir="${maven.home}.backup"/>
- <delete dir="${lib.repo}.backup"/>
+ <delete dir="${maven.repo.local}.backup"/>
<mkdir dir="${maven.home}.backup"/>
- <mkdir dir="${lib.repo}.backup"/>
+ <mkdir dir="${maven.repo.local}.backup"/>
<copy todir="${maven.home}.backup">
<fileset dir="${maven.home}"/>
</copy>
- <copy todir="${lib.repo}.backup">
- <fileset dir="${lib.repo}"/>
+ <copy todir="${maven.repo.local}.backup">
+ <fileset dir="${maven.repo.local}"/>
</copy>
<delete dir="${maven.home}"/>
- <delete dir="${lib.repo}"/>
+ <delete dir="${maven.repo.local}"/>
<mkdir dir="${maven.home}"/>
- <mkdir dir="${lib.repo}"/>
+ <mkdir dir="${maven.repo.local}"/>
<antcall target="bootstrap"/>
@@ -125,7 +125,7 @@
depends="install"
description="--> Update local jars, generate maven's build system, generate
maven, and setup the distributions.">
- <copy todir="${maven.home}/lib" file="${lib.repo}/maven.jar"/>
+ <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">
@@ -152,8 +152,8 @@
<!-- Remove any cruft left in build.dest -->
<delete dir="target"/>
- <!-- Remove the maven.jar from lib.repo -->
- <delete file="${lib.repo}/maven.jar"/>
+ <!-- Remove the maven.jar from maven.repo.local -->
+ <delete file="${maven.repo.local}/maven.jar"/>
</target>
<!-- ================================================================== -->
@@ -193,7 +193,7 @@
<get-list
listFile="jars.list"
- dest="${lib.repo}"
+ dest="${maven.repo.local}"
baseUrl="${maven.get.jars.baseUrl}/"
/>
</target>
@@ -207,7 +207,7 @@
<get-list
listFile="jars.list"
- dest="${lib.repo}"
+ dest="${maven.repo.local}"
baseUrl="${maven.get.jars.baseUrl}/"
proxyHost="${maven.proxy.host}"
proxyPort="${maven.proxy.port}"
@@ -216,7 +216,7 @@
<target
name="update-jars"
- depends="phase1-compile,make-lib-repo-dir,get-jars-proxy,get-jars-no-proxy">
+
depends="phase1-compile,make-maven-repo-local-dir,get-jars-proxy,get-jars-no-proxy">
</target>
@@ -283,7 +283,7 @@
<create-classpath
listFile="jars.list"
reference="bootstrap-classpath"
- baseDir="${lib.repo}"
+ baseDir="${maven.repo.local}"
/>
<javac
@@ -316,15 +316,15 @@
<!--
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 lib.repo so that the generated
+ maven.jar file and place it in maven.repo.local so that the generated
build system will work. Maven expects the presence of
- ${lib.repo}/maven.jar and we want to use Maven as it
+ ${maven.repo.local}/maven.jar and we want to use Maven as it
is used for any normal project. Later in the build
process we will replace this bootstrap version of
maven.jar with the completely populated maven.jar.
-->
- <jar jarfile="${lib.repo}/maven.jar">
+ <jar jarfile="${maven.repo.local}/maven.jar">
<fileset dir="${maven.bootstrap.classes}">
<include name="**/*.class"/>
<include name="**/*.properties"/>
@@ -386,7 +386,7 @@
/>
<copy todir="${maven.home}/lib">
- <fileset dir="${lib.repo}">
+ <fileset dir="${maven.repo.local}">
<patternset refid="install-patternset"/>
</fileset>
</copy>
@@ -430,7 +430,7 @@
/>
<copy todir="${maven.home}/install">
- <fileset dir="${lib.repo}">
+ <fileset dir="${maven.repo.local}">
<patternset refid="install-patternset"/>
</fileset>
</copy>
@@ -490,7 +490,7 @@
<create-classpath
listFile="jars.list"
reference="bootstrap-classpath"
- baseDir="${lib.repo}"
+ baseDir="${maven.repo.local}"
/>
<taskdef
@@ -551,23 +551,23 @@
</target>
<!--
- Create the lib.repo directory if it doesn't exist.
+ Create the maven.repo.local directory if it doesn't exist.
-->
<target
- name="make-lib-repo-dir"
- depends="check-lib-repo-dir"
- unless="maven.lib.repo.dir.exists">
- <mkdir dir="${lib.repo}"/>
+ name="make-maven-repo-local-dir"
+ depends="check-maven-repo-local-dir"
+ unless="maven.repo.local.dir.exists">
+ <mkdir dir="${maven.repo.local}"/>
</target>
<!--
- Check for the existence of the lib.repo directory.
+ Check for the existence of the maven.repo.local directory.
-->
<target
- name="check-lib-repo-dir">
+ name="check-maven-repo-local-dir">
<available
- property="maven.lib.repo.dir.exists"
- file="${lib.repo}"
+ property="maven.repo.local.dir.exists"
+ file="${maven.repo.local}"
type="dir"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
