dion 2002/06/13 18:42:41
Modified: . build-bootstrap.xml
Log:
Bootstrap changes for j2ee appserver patch from Pete Lynch
Revision Changes Path
1.99 +72 -65 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- build-bootstrap.xml 12 Jun 2002 00:05:48 -0000 1.98
+++ build-bootstrap.xml 14 Jun 2002 01:42:41 -0000 1.99
@@ -8,23 +8,23 @@
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="project.properties" />
-
- <property
- name="maven.get.jars.baseUrl"
+
+ <property
+ name="maven.get.jars.baseUrl"
value="http://jakarta.apache.org/turbine/jars";
/>
-
- <property
- name="maven.bootstrap.dir"
+
+ <property
+ name="maven.bootstrap.dir"
value="${basedir}/bootstrap"
/>
-
- <property
+
+ <property
name="maven.bootstrap.classes"
value="${maven.bootstrap.dir}/classes"
/>
- <property
+ <property
name="maven.conf.dir"
value="src/conf"
/>
@@ -39,11 +39,11 @@
<!-- In order to bootstrap Maven you must have the following -->
<!-- properties defined in order for the bootstrap to work -->
<!-- correctly: -->
- <!-- -->
+ <!-- -->
<!-- ${lib.repo} : Local JAR repository -->
<!-- ${maven.home}: Maven installation directory -->
<!-- ================================================================== -->
-
+
<target
name="check-properties"
depends="check-maven-home,check-lib-repo">
@@ -57,7 +57,7 @@
| ERROR!
|
| You must set ${lib.repo} in your ${user.home}/build.properties
- |
+ |
| Please refer to the bootstrap document:
| http://jakarta.apache.org/turbine/maven/bootstrap.html
+------------------------------------------------------------------
@@ -72,7 +72,7 @@
| ERROR!
|
| You must set ${maven.home} in your ${user.home}/build.properties
- |
+ |
| Please refer to the bootstrap document:
| http://jakarta.apache.org/turbine/maven/bootstrap.html
+------------------------------------------------------------------
@@ -87,7 +87,7 @@
<!-- should be used in conjuction with a clean checkout to make -->
<!-- sure that everything is cool with the boostrap process. -->
<!-- ================================================================== -->
-
+
<target
name="clean-bootstrap">
@@ -96,7 +96,7 @@
<mkdir dir="${maven.home}.backup"/>
<mkdir dir="${lib.repo}.backup"/>
-
+
<copy todir="${maven.home}.backup">
<fileset dir="${maven.home}"/>
</copy>
@@ -114,32 +114,32 @@
<antcall target="bootstrap"/>
</target>
-
+
<!-- ================================================================== -->
<!-- D E F A U L T B O O T S T R A P -->
<!-- ================================================================== -->
-
+
<target
name="bootstrap"
depends="install"
description="--> Update local jars, generate maven's build system, generate
maven, and setup the distributions.">
-
+
<ant antfile="build.xml" target="maven:clean"/>
<ant antfile="build.xml" target="maven:install-jar"/>
<copy todir="${maven.home}/lib" file="${lib.repo}/maven.jar"/>
</target>
-
- <target
+
+ <target
name="clean"
depends="check-properties">
-
+
<!-- Remove any cruft left in build.dest -->
<delete dir="target"/>
<!-- Remove the maven.jar from lib.repo -->
- <delete file="${lib.repo}/maven.jar"/>
+ <delete file="${lib.repo}/maven.jar"/>
</target>
<!-- ================================================================== -->
@@ -175,7 +175,7 @@
listFile="jars.list"
/>
- </target>
+ </target>
<!-- ================================================================== -->
<!-- G E T B O O T S T R A P J A R S -->
@@ -213,11 +213,11 @@
proxyPort="${maven.proxy.port}"
/>
</target>
-
+
<target
name="update-jars"
depends="phase1-compile,make-lib-repo-dir,get-jars-proxy,get-jars-no-proxy">
-
+
</target>
<!-- ================================================================== -->
@@ -230,11 +230,11 @@
<!-- 1. GetList: Allows us to download a list of JARs into a specified -->
<!-- directory. Used to pull down the JARs to build Maven before -->
<!-- we have use of the POM. -->
- <!-- -->
- <!-- 2. CreateClasspath: Allows us to create a class from a list of -->
+ <!-- -->
+ <!-- 2. CreateClasspath: Allows us to create a class from a list of -->
<!-- JARs. Used in the phase2-compile which compiles the classes -->
- <!-- required to generate the build system. -->
- <!-- -->
+ <!-- required to generate the build system. -->
+ <!-- -->
<!-- 3. CreatePatternSet: Allows us to create a patternset that can -->
<!-- be used within a fileset definition. Used in the dist to -->
<!-- copy the JARs specified in our jars.list into the Maven -->
@@ -243,7 +243,7 @@
<target
name="phase1-compile">
-
+
<delete dir="${maven.bootstrap.dir}"/>
<mkdir dir="${maven.bootstrap.classes}"/>
@@ -279,13 +279,13 @@
<pathelement location="${maven.bootstrap.classes}"/>
</classpath>
</taskdef>
-
+
<create-classpath
listFile="jars.list"
reference="bootstrap-classpath"
baseDir="${lib.repo}"
/>
-
+
<javac
destdir="${maven.bootstrap.classes}"
debug="on"
@@ -304,15 +304,15 @@
<!--
Copy Maven configuration files that need to be in the maven jar
-->
- <copy file="${maven.conf.dir}/log4j.properties"
+ <copy file="${maven.conf.dir}/log4j.properties"
todir="${maven.bootstrap.classes}"/>
-
- <copy file="${maven.conf.dir}/bootstrap-taskdefs.properties"
+
+ <copy file="${maven.conf.dir}/bootstrap-taskdefs.properties"
tofile="${maven.bootstrap.classes}/maven-taskdefs.properties"/>
-
- <!--
+
+ <!--
After we have compiled the classes required to generate
- the build system we need to make a temporary bootstrap
+ the build system we need to make a temporary bootstrap
maven.jar file and place it in lib.repo 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
@@ -327,7 +327,7 @@
<include name="**/*.properties"/>
<exclude name="**/package.html"/>
</fileset>
- </jar>
+ </jar>
</target>
@@ -348,7 +348,7 @@
<copy todir="${maven.home}/stylesheets">
<fileset dir="src/dvsl/xdocs"/>
</copy>
-
+
<copy todir="${maven.home}/dvsl/gump">
<fileset dir="src/dvsl/gump"/>
</copy>
@@ -382,17 +382,17 @@
allow a user to easily create a sample Maven project.
-->
- <copy
+ <copy
toDir="${maven.home}/examples"
file="src/examples/build-project.xml"
/>
- <copy
+ <copy
toDir="${maven.home}/examples"
file="project.xml"
/>
- <copy
+ <copy
toDir="${maven.home}/examples"
file="project.properties"
/>
@@ -405,7 +405,7 @@
<copy todir="${maven.home}/bin">
<fileset dir="src/bin"/>
</copy>
-
+
<chmod file="${maven.home}/bin/maven" perm="+x"/>
<chmod file="${maven.home}/bin/maven2" perm="+x"/>
@@ -424,17 +424,24 @@
<copy todir="${maven.home}/lib">
<fileset dir="${lib.repo}">
- <patternset refid="install-patternset"/>
+ <patternset refid="install-patternset"/>
</fileset>
</copy>
- <copy
+ <copy
file="jars.list"
- tofile="${maven.home}/plugins/core/jars.list"
+ tofile="${maven.home}/plugins/core/jars.list"
overwrite="yes"
/>
- </target>
+ <!--
+ Install any additional plugin files if any
+ -->
+ <copy toDir="${maven.home}/plugins" verbose="true">
+ <fileset dir="src/templates/build/plugins" includes="**/**"
excludes="*/Control.vm"/>
+ </copy>
+
+ </target>
<!-- ================================================================== -->
<!-- D I S T R I B U T I O N S -->
@@ -444,12 +451,12 @@
<!-- manually install Maven. -->
<!-- ================================================================== -->
- <target
+ <target
name="dist"
depends="bootstrap">
<mkdir dir="${maven.home}/install"/>
-
+
<copy tofile="${maven.home}/install/maven.jar" file="target/maven.jar"/>
<copy todir="${maven.home}/install" file="src/install/build.xml"/>
@@ -460,7 +467,7 @@
<pathelement location="target/classes"/>
</classpath>
</taskdef>
-
+
<create-patternset
listFile="jars.list"
reference="install-patternset"
@@ -468,7 +475,7 @@
<copy todir="${maven.home}/install">
<fileset dir="${lib.repo}">
- <patternset refid="install-patternset"/>
+ <patternset refid="install-patternset"/>
</fileset>
</copy>
@@ -523,7 +530,7 @@
<pathelement location="target/maven.jar"/>
</classpath>
</taskdef>
-
+
<create-classpath
listFile="jars.list"
reference="bootstrap-classpath"
@@ -540,7 +547,7 @@
</taskdef>
<ant dir="src/descriptors"/>
-
+
<package-project-map
descriptorDir="src/descriptors/project"
map="${maven.home}/package-project.map"
@@ -552,11 +559,11 @@
<!-- U T I L I T Y T A R G E T S -->
<!-- ================================================================== -->
- <!--
+ <!--
Create the maven.home directory if it doesn't exists, otherwise remove
the directory contents.
-->
- <target
+ <target
name="make-maven-home-dir"
depends="clean-maven-home-dir"
unless="maven.maven.home.dir.exists">
@@ -566,11 +573,11 @@
<!--
Check for the existence of the maven.home directory.
-->
- <target
+ <target
name="check-maven-home-dir">
- <available
+ <available
property="maven.maven.home.dir.exists"
- file="${maven.home}"
+ file="${maven.home}"
type="dir"
/>
</target>
@@ -578,7 +585,7 @@
<!--
If the maven.home directory exists remove it's contents.
-->
- <target
+ <target
name="clean-maven-home-dir"
depends="check-maven-home-dir"
if="maven.maven.home.dir.exists">
@@ -586,23 +593,23 @@
<fileset dir="${maven.home}"/>
</delete>
</target>
-
+
<!--
Create the lib.repo directory if it doesn't exist.
-->
- <target
+ <target
name="make-lib-repo-dir"
depends="check-lib-repo-dir"
- unless="maven.lib.repo.dir.exists">
+ unless="maven.lib.repo.dir.exists">
<mkdir dir="${lib.repo}"/>
</target>
<!--
Check for the existence of the lib.repo directory.
-->
- <target
+ <target
name="check-lib-repo-dir">
- <available
+ <available
property="maven.lib.repo.dir.exists"
file="${lib.repo}"
type="dir"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
