brett 2003/12/30 17:29:02
Modified: . Tag: MAVEN-1_0-BRANCH build-bootstrap.xml maven.xml
Log:
changes to bootstrap - simpler plugin build and run plugin tests
Revision Changes Path
No revision
No revision
1.212.2.4 +19 -37 maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap.xml,v
retrieving revision 1.212.2.3
retrieving revision 1.212.2.4
diff -u -r1.212.2.3 -r1.212.2.4
--- build-bootstrap.xml 10 Dec 2003 04:06:49 -0000 1.212.2.3
+++ build-bootstrap.xml 31 Dec 2003 01:29:02 -0000 1.212.2.4
@@ -235,7 +235,7 @@
<echo>
+------------------------------------------------------------------+
| |
-| B U I L D I N G T H E P L U G I N S |
+| I N S T A L L I N G T H E P L U G I N S |
| |
+------------------------------------------------------------------+
</echo>
@@ -246,32 +246,34 @@
<arg value="-Dmaven.home.local=${maven.home.local}"/>
<arg value="-Dmaven.repo.local=${maven.repo.local}"/>
<arg value="${maven.bootstrap.online}"/>
- <arg value="maven:plugins-build"/>
+ <arg value="maven:plugins-install"/>
<arg value="-e"/>
</exec>
+ <delete includeEmptyDirs="true">
+ <fileset dir="${maven.home}/plugins" includes="${maven.bootstrap.plugins}" />
+ </delete>
+ <delete dir="${maven.bootstrap.install.dir}/plugins" />
+ <copy todir="${maven.bootstrap.install.dir}/plugins">
+ <fileset dir="${maven.home}/plugins" />
+ </copy>
<echo>
+------------------------------------------------------------------+
| |
-| I N S T A L L I N G T H E P L U G I N S |
+| T E S T I N G T H E P L U G I N S |
| |
+------------------------------------------------------------------+
</echo>
- <delete dir="${maven.bootstrap.install.dir}/plugins"/>
- <mkdir dir="${maven.bootstrap.install.dir}/plugins"/>
-
- <copy todir="${maven.bootstrap.install.dir}/plugins" flatten="yes">
- <fileset dir="${maven.plugins.directory}">
- <include name="**/target/maven*plugin*.jar"/>
-
- <!-- Exclude plugins no one can be using -->
- <exclude name="**/target/maven-dependency-plugin*.jar"/>
- <exclude name="**/target/maven-graph-plugin*.jar"/>
- <exclude name="**/target/maven-jdiff-plugin*.jar"/>
- <exclude name="**/target/maven-xdoclet-plugin*.jar"/>
- </fileset>
- </copy>
+ <exec
+ executable="${maven.command}"
+ failonerror="true">
+ <arg value="-Dmaven.home.local=${maven.home.local}"/>
+ <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
+ <arg value="${maven.bootstrap.online}"/>
+ <arg value="maven:plugins-test"/>
+ <arg value="-e"/>
+ </exec>
<echo>
+------------------------------------------------------------------+
@@ -322,25 +324,6 @@
</copy>
<chmod file="${maven.home}/bin/maven" perm="+x"/>
-
- <!-- run plugin test projects -->
-
- <!--
-
- This needs to be decoupled and moved and it appears to be
- coupled to src/plugins-build. I will fix shortly but I want the
- bootstrap to work in the interim.
-
- <exec executable="${maven.command}" failonerror="true">
- <arg value="-Dmaven.home.local=${maven.home.local}"/>
- <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
- <arg value="${maven.bootstrap.online}"/>
- <arg value="clean"/>
- <arg value="maven:plugin-test"/>
- </exec>
- -->
-
-
</target>
<!-- ===================================================================== -->
@@ -443,5 +426,4 @@
<delete dir="${maven.home.local}/plugins"/>
</target>
-
</project>
1.97.2.3 +16 -12 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.97.2.2
retrieving revision 1.97.2.3
diff -u -r1.97.2.2 -r1.97.2.3
--- maven.xml 10 Dec 2003 23:01:15 -0000 1.97.2.2
+++ maven.xml 31 Dec 2003 01:29:02 -0000 1.97.2.3
@@ -67,6 +67,22 @@
</goal>
<goal
+ name="maven:plugins-test"
+ description="Test each Maven plugin">
+
+ <!-- TODO [RC2] - put back xdoc,checkstyle,clover,dashboard,war -->
+ <!-- TODO [RC2] - put back html2xdoc - fails because of checkstyle -->
+ <maven:reactor
+ basedir="${maven.plugins.directory}"
+ includes="${maven.plugins.includes}"
+
excludes="${maven.plugins.excludes},xdoc/**,checkstyle/**,clover/**,dashboard/**,war/**,html2xdoc/**"
+ goals="plugin:test"
+ banner="Testing"
+ ignoreFailures="false"
+ />
+ </goal>
+
+ <goal
name="maven:plugins-install"
description="Install each Maven plugin">
@@ -92,18 +108,6 @@
ignoreFailures="false"
/>
</goal>
-
- <!-- ================================================================== -->
- <!-- R U N P L U G I N T E S T S -->
- <!-- ================================================================== -->
- <!--
- <goal name="maven:plugin-test">
- <j:set var="maven.multiproject.includes"
- value="*/src/plugin-test/project.xml" />
- <j:set var="goal" value="testPlugin"/>
- <attainGoal name="multiproject:goal" />
- </goal>
- -->
<goal name="maven:jar-install"
description="Compile Maven and put a new jar in ${maven.home}/lib.">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
