brett 2003/10/30 03:24:42
Modified: . Tag: MAVEN_RC2_UNSTABLE build-bootstrap.xml
Log:
PR: MAVEN-760
change bootstrap method to create plugin JAR files instead of copying the source
Revision Changes Path
No revision
No revision
1.207.2.1 +50 -29 maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap.xml,v
retrieving revision 1.207
retrieving revision 1.207.2.1
diff -u -r1.207 -r1.207.2.1
--- build-bootstrap.xml 18 Sep 2003 10:25:56 -0000 1.207
+++ build-bootstrap.xml 30 Oct 2003 11:24:41 -0000 1.207.2.1
@@ -150,7 +150,7 @@
<!-- e) jar -->
<!-- f) clean -->
<!-- g) license -->
- <!-- h) plugin -->
+ <!-- h) plugin -->
<!-- ===================================================================== -->
<echo>
@@ -224,33 +224,60 @@
overwrite="yes"
/>
- <copy todir="${maven.bootstrap.install.dir}/plugins">
- <fileset dir="src/plugins-build">
- <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>
- </copy>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/clean.jar"
+ basedir="src/plugins-build/clean">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/jar.jar"
+ basedir="src/plugins-build/jar">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/java.jar"
+ basedir="src/plugins-build/java">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/license.jar"
+ basedir="src/plugins-build/license">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/touchstone.jar"
+ basedir="src/plugins-build/touchstone">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/touchstone-partner.jar"
+ basedir="src/plugins-build/touchstone-partner">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/test.jar"
+ basedir="src/plugins-build/test">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
+ <jar
+ jarfile="${maven.bootstrap.install.dir}/plugins/plugin.jar"
+ basedir="src/plugins-build/plugin">
+ <exclude name="**/maven.xml"/>
+ <exclude name="**/target/**"/>
+ </jar>
<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/**" />
+ <!-- <exclude name="plugins/**" /> -->
</fileset>
</copy>
@@ -312,12 +339,6 @@
<copy todir="${maven.bootstrap.install.dir}/plugins" flatten="yes">
<fileset dir="src/plugins-build">
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
