You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/03/05 16:29:19 UTC
cvs commit: jakarta-turbine-maven build-bootstrap.xml
jvanzyl 02/03/05 07:29:19
Modified: . build-bootstrap.xml
Log:
Jeff, Pete and myself decided that the fat JAR approach is a bad one and
that we will encourage the use of lib.repo. So the bootstrap has been changed
to do the following:
-> build the classes required to generate the build system and
the classes required for the update-jars target to work so the
rest of what maven needs to build can be brought down.
To use Maven users will have to use the update-jars target right from
the get go to bring down the classes that Maven requires to work. This
will keep the maven jar small and get people using lib.repo right away.
Revision Changes Path
1.25 +21 -99 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build-bootstrap.xml 5 Mar 2002 04:12:57 -0000 1.24
+++ build-bootstrap.xml 5 Mar 2002 15:29:19 -0000 1.25
@@ -24,9 +24,6 @@
<pathelement location="${lib.repo}/log4j-1.1.3.jar"/>
<pathelement location="${lib.repo}/stratum-0.1-dev.jar"/>
<pathelement location="${lib.repo}/velocity-1.3-dev.jar"/>
- <pathelement location="${lib.repo}/bcel.jar"/>
- <pathelement location="${lib.repo}/oro.jar"/>
- <pathelement location="${lib.repo}/genjar.jar"/>
<pathelement location="${basedir}/bootstrap"/>
</path>
@@ -35,31 +32,35 @@
<!-- ================================================================== -->
<target
- name="generate-build">
+ name="compile">
<!-- Remove the elements of past generations before creating
the new one -->
-
- <!--
- <delete file="build-metrics.xml"/>
- <delete file="build-docs.xml"/>
- <delete file="build-test.xml"/>
- <delete file="build.xml"/>
- <delete file="default.properties"/>
- <delete file="LICENSE"/>
- <delete file="README.txt"/>
- -->
+ <delete dir="${basedir}/bootstrap"/>
<mkdir dir="${basedir}/bootstrap"/>
<javac
- srcdir="src/java"
destdir="${basedir}/bootstrap"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
<classpath refid="classpath"/>
+ <src>
+ <path location="src/java"/>
+ </src>
+ <include name="org/apache/maven/BaseProjectTask.java"/>
+ <include name="org/apache/maven/project/*"/>
</javac>
+ </target>
+
+ <target
+ name="generate-build"
+ depends="compile">
+
+ <!-- Remove any previously generated build systems -->
+ <delete dir="${basedir}/maven"/>
+ <mkdir dir="${basedir}/maven"/>
<taskdef
name="create-build-system"
@@ -75,65 +76,6 @@
projectDescriptor="project.xml"
/>
- <taskdef
- name="genjar"
- classname="org.apache.tools.ant.taskdefs.optional.genjar.GenJar">
- <classpath refid="classpath"/>
- </taskdef>
-
- <genjar
- jarfile="${lib.repo}/maven.jar">
-
- <class name="org.apache.maven.Reactor"/>
- <class name="org.apache.maven.BaseProjectTask"/>
- <class name="org.apache.maven.ProjectProperties"/>
- <class name="org.apache.maven.Jxr"/>
- <class name="org.apache.maven.ChangeLog"/>
- <class name="org.apache.maven.UpdateResources"/>
- <class name="org.apache.maven.DVSLFormatter"/>
-
- <!-- The project classes have to be all list, dynamic loading -->
- <class name="org.apache.maven.project.BaseObject"/>
- <class name="org.apache.maven.project.Build"/>
- <class name="org.apache.maven.project.Dependency"/>
- <class name="org.apache.maven.project.Developer"/>
- <class name="org.apache.maven.project.Jar"/>
- <class name="org.apache.maven.project.MailingList"/>
- <class name="org.apache.maven.project.Profile"/>
- <class name="org.apache.maven.project.Project"/>
- <class name="org.apache.maven.project.Repository"/>
- <class name="org.apache.maven.project.Workspace"/>
-
- <classfilter>
- <include name="org.apache.stratum."/>
- <include name="org.apache.maven."/>
- <include name="org.apache.commons."/>
- <include name="org.apache.log4j."/>
- <include name="org.apache.velocity."/>
- <include name="org.apache.bcel."/>
- <include name="org.apache.oro."/>
- <exclude name="org.apache.log."/>
- </classfilter>
- <!-- The GenJar task doesn't accept a classpath refid
- so I have to dupe the list here. I will fix.
- -->
- <classpath>
- <pathelement location="${lib.repo}/dom4j-1.1.jar"/>
- <pathelement location="${lib.repo}/commons-util-1.0-rc2-dev.jar"/>
- <pathelement location="${lib.repo}/commons-lang-0.1-dev.jar"/>
- <pathelement location="${lib.repo}/commons-beanutils.jar"/>
- <pathelement location="${lib.repo}/commons-collections.jar"/>
- <pathelement location="${lib.repo}/commons-graph.jar"/>
- <pathelement location="${lib.repo}/commons-io.jar"/>
- <pathelement location="${lib.repo}/log4j-1.1.3.jar"/>
- <pathelement location="${lib.repo}/stratum-0.1-dev.jar"/>
- <pathelement location="${lib.repo}/velocity-1.3-dev.jar"/>
- <pathelement location="${lib.repo}/bcel.jar"/>
- <pathelement location="${lib.repo}/oro.jar"/>
- <pathelement location="${basedir}/bootstrap"/>
- </classpath>
- </genjar>
-
<delete dir="${basedir}/bootstrap"/>
</target>
@@ -148,11 +90,6 @@
verbose="false"
usetimestamp="true"/>
- <get src="${get.jars.baseUrl}/bcel.jar"
- dest="${lib.repo}/bcel.jar"
- verbose="false"
- usetimestamp="true"/>
-
<get src="${get.jars.baseUrl}/log4j-1.1.3.jar"
dest="${lib.repo}/log4j-1.1.3.jar"
verbose="false"
@@ -163,11 +100,6 @@
verbose="false"
usetimestamp="true"/>
- <get src="${get.jars.baseUrl}/velocity-dvsl-0.40.jar"
- dest="${lib.repo}/velocity-dvsl-0.40.jar"
- verbose="false"
- usetimestamp="true"/>
-
<get src="${get.jars.baseUrl}/dom4j-1.1.jar"
dest="${lib.repo}/dom4j-1.1.jar"
verbose="false"
@@ -178,6 +110,11 @@
verbose="false"
usetimestamp="true"/>
+ <get src="${get.jars.baseUrl}/commons-graph.jar"
+ dest="${lib.repo}/commons-graph.jar"
+ verbose="false"
+ usetimestamp="true"/>
+
<get src="${get.jars.baseUrl}/commons-lang-0.1-dev.jar"
dest="${lib.repo}/commons-lang-0.1-dev.jar"
verbose="false"
@@ -200,21 +137,6 @@
<get src="${get.jars.baseUrl}/commons-collections.jar"
dest="${lib.repo}/commons-collections.jar"
- verbose="false"
- usetimestamp="true"/>
-
- <get src="${get.jars.baseUrl}/oro.jar"
- dest="${lib.repo}/oro.jar"
- verbose="false"
- usetimestamp="true"/>
-
- <get src="${get.jars.baseUrl}/genjar.jar"
- dest="${lib.repo}/genjar.jar"
- verbose="false"
- usetimestamp="true"/>
-
- <get src="${get.jars.baseUrl}/jdepend.jar"
- dest="${lib.repo}/jdepend.jar"
verbose="false"
usetimestamp="true"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>