You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2003/12/02 05:01:11 UTC
cvs commit: maven build-bootstrap.xml maven.xml project.properties
brett 2003/12/01 20:01:11
Modified: . Tag: MAVEN-1_0-BRANCH build-bootstrap.xml maven.xml
project.properties
Log:
fix bootstrap
Revision Changes Path
No revision
No revision
1.212.2.2 +2 -23 maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap.xml,v
retrieving revision 1.212.2.1
retrieving revision 1.212.2.2
diff -u -r1.212.2.1 -r1.212.2.2
--- build-bootstrap.xml 26 Nov 2003 11:45:15 -0000 1.212.2.1
+++ build-bootstrap.xml 2 Dec 2003 04:01:10 -0000 1.212.2.2
@@ -208,34 +208,13 @@
/>
<copy todir="${maven.bootstrap.install.dir}/plugins">
- <fileset dir="${maven.plugins.directory}">
- <include name="clean/**"/>
- <include name="jar/**"/>
- <include name="java/**"/>
- <include name="test/**"/>
- <include name="license/**"/>
- <include name="touchstone/**"/>
- <include name="touchstone-partner/**"/>
- <include name="plugin/**"/>
- <include name="project.xml"/>
- <exclude name="**/maven.xml"/>
- <exclude name="**/target/**"/>
- </fileset>
+ <fileset dir="${maven.plugins.directory}" includes="${maven.bootstrap.plugins},project.xml" excludes="**/maven.xml,**/target/**" />
</copy>
<antcall target="clean-maven-home"/>
<copy todir="${maven.home}">
- <fileset dir="${maven.bootstrap.install.dir}">
- <exclude name="plugins/**" />
- </fileset>
- </copy>
-
- <!-- expanded plugins should be put in the maven.home.local -->
- <copy todir="${maven.home.local}">
- <fileset dir="${maven.bootstrap.install.dir}">
- <include name="plugins/**" />
- </fileset>
+ <fileset dir="${maven.bootstrap.install.dir}" />
</copy>
<!-- Now we have a functional maven install -->
1.97.2.1 +13 -8 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.97
retrieving revision 1.97.2.1
diff -u -r1.97 -r1.97.2.1
--- maven.xml 24 Nov 2003 21:25:14 -0000 1.97
+++ maven.xml 2 Dec 2003 04:01:10 -0000 1.97.2.1
@@ -34,14 +34,18 @@
We are online so the touchstone will be run ...
</echo>
- <maven:maven
- descriptor="${basedir}/src/test/touchstone-build/project.xml"
- goals="clean,jar:jar,touchstone-tests"
- ignoreFailures="false"
- />
+ <attainGoal name="maven:run-touchstone" />
</j:if>
</postGoal>
+ <goal name="maven:run-touchstone">
+ <maven:maven
+ descriptor="${basedir}/src/test/touchstone-build/project.xml"
+ goals="clean,jar:jar,touchstone-tests"
+ ignoreFailures="false"
+ />
+ </goal>
+
<!-- ================================================================== -->
<!-- B U I L D P L U G I N S -->
<!-- ================================================================== -->
@@ -54,8 +58,8 @@
<maven:reactor
basedir="${maven.plugins.directory}"
- includes="*/project.xml"
- excludes="examples/*"
+ includes="${maven.plugins.includes}"
+ excludes="${maven.plugins.excludes}"
goals="clean,plugin"
banner="Building"
ignoreFailures="false"
@@ -67,7 +71,8 @@
<maven:reactor
basedir="${maven.plugins.directory}"
- includes="*/project.xml"
+ includes="${maven.plugins.includes}"
+ excludes="${maven.plugins.excludes}"
goals="clean"
banner="Building"
ignoreFailures="false"
1.51.2.1 +5 -1 maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven/project.properties,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- project.properties 25 Nov 2003 05:36:50 -0000 1.51
+++ project.properties 2 Dec 2003 04:01:10 -0000 1.51.2.1
@@ -76,6 +76,8 @@
maven.bootstrap.plugins = clean/**,jar/**,java/**,license/**,plugin/**,test/**,touchstone/**,touchstone-partner/**
maven.bootstrap.reactor = clean/project.xml,jar/project.xml,java/project.xml,license/project.xml,plugin/project.xml,touchstone/project.xml,touchstone-partner/project.xml
maven.plugins.directory = ${basedir}/../maven-plugins
+maven.plugins.includes = */project.xml
+maven.plugins.excludes = examples/**
maven.get.jars.baseUrl = http://www.ibiblio.org/maven
maven.bootstrap.dir = ${basedir}/bootstrap
@@ -88,7 +90,9 @@
# Offline mode:
# maven.bootstrap.online = -o
# ------------------------------------------------------------------------------
-maven.bootstrap.online=
+# TODO [RC2] - reinstate once touchstone works again
+# maven.bootstrap.online=
+maven.bootstrap.online= -o
# ------------------------------------------------------------------------------
# The bootstrap classes consist of an Ant task front that:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org