jvanzyl 2003/11/24 12:18:00
Modified: . build-bootstrap.xml maven.xml project.properties
Removed: . build-bootstrap-core.xml
Log:
o get rid of the core bootstrap
o cleanup the core maven.xml file by offloading stuff into other jelly files
as this is necessary to find out why the bootstrap is couple to a source
location.
Feel free to help in the hunt, I'll keep going until I find it.
Revision Changes Path
1.209 +4 -31 maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap.xml,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- build-bootstrap.xml 13 Nov 2003 20:14:37 -0000 1.208
+++ build-bootstrap.xml 24 Nov 2003 20:18:00 -0000 1.209
@@ -77,7 +77,7 @@
<bootstrap
projectDescriptor="project.xml"
baseUrl="${maven.get.jars.baseUrl}/"
- mavenLocalRepo="${maven.repo.local}"
+ mavenRepoLocal="${maven.repo.local}"
online="${maven.bootstrap.online}"
proxyHost="${maven.proxy.host}"
proxyUserName="${maven.proxy.username}"
@@ -137,22 +137,6 @@
</fileset>
</jar>
- <!-- ===================================================================== -->
- <!-- P H A S E 1 I N S T A L L -->
- <!-- ===================================================================== -->
- <!-- This will produce a functional Maven install. The only plugins that -->
- <!-- are installed are the: -->
- <!-- -->
- <!-- a) java -->
- <!-- b) test -->
- <!-- c) touchstone -->
- <!-- d) touchstone-partner -->
- <!-- e) jar -->
- <!-- f) clean -->
- <!-- g) license -->
- <!-- h) plugin -->
- <!-- ===================================================================== -->
-
<echo>
+------------------------------------------------------------------+
| |
@@ -225,7 +209,7 @@
/>
<copy todir="${maven.bootstrap.install.dir}/plugins">
- <fileset dir="src/plugins-build">
+ <fileset dir="${maven.plugins.directory}">
<include name="clean/**"/>
<include name="jar/**"/>
<include name="java/**"/>
@@ -287,17 +271,6 @@
<arg value="-e"/>
</exec>
- <!--
- <exec
- executable="${maven.command}"
- failonerror="true">
- <arg value="${maven.bootstrap.online}"/>
- <arg value="java:jar"/>
- <arg value="-e"/>
- </exec>
- -->
-
-
<echo>
+------------------------------------------------------------------+
| |
@@ -310,7 +283,7 @@
<mkdir dir="${maven.bootstrap.install.dir}/plugins"/>
<copy todir="${maven.bootstrap.install.dir}/plugins" flatten="yes">
- <fileset dir="src/plugins-build">
+ <fileset dir="${maven.plugins.directory}">
<include name="**/target/maven*plugin*.jar"/>
<!-- Exclude plugins no one can be using -->
@@ -358,7 +331,7 @@
<include name="maven-project-*.xsd"/>
</fileset>
</copy>
-
+
<copy
file="${basedir}/src/xsd/maven-navigation-1.0.xsd"
todir="${maven.bootstrap.install.dir}"
1.96 +2 -250 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- maven.xml 13 Nov 2003 20:14:37 -0000 1.95
+++ maven.xml 24 Nov 2003 20:18:00 -0000 1.96
@@ -53,7 +53,7 @@
description="Build each Maven plugin into an installable jar">
<maven:reactor
- basedir="${maven.src.dir}/plugins-build"
+ basedir="${maven.plugins.directory}"
includes="*/project.xml"
excludes="examples/*"
goals="clean,plugin"
@@ -62,25 +62,11 @@
/>
</goal>
- <goal
- name="maven:core-plugins-build"
- description="Build each Maven plugin into an installable jar">
-
- <maven:reactor
- basedir="${maven.src.dir}/plugins-build"
-
includes="clean/project.xml,jar/project.xml,java/project.xml,license/project.xml,plugin/project.xml,test/project.xml,touchstone/project.xml,touchstone-partner/project.xml"
- excludes="examples/*"
- goals="clean,plugin"
- banner="Building"
- ignoreFailures="false"
- />
- </goal>
-
<goal name="maven:plugins-clean"
description="Cleans all plugin projects">
<maven:reactor
- basedir="${maven.src.dir}/plugins-build"
+ basedir="${maven.plugins.directory}"
includes="*/project.xml"
goals="clean"
banner="Building"
@@ -88,70 +74,6 @@
/>
</goal>
- <!--
- |
- | Some goals to help with the release of Maven itself.
- |
- -->
-
- <goal name="pre-release-work">
- <attainGoal name="maven:plugin-increment-snapshot-version"/>
- <attainGoal name="maven:plugin-convert-snapshots"/>
- </goal>
-
- <goal name="maven:plugin-convert-snapshots"
- description="Convert snapshot versions into resolved timestamped versions.">
-
- <maven:reactor
- basedir="${maven.src.dir}/plugins-build"
- includes="*/project.xml"
- goals="convert-snapshots-auto"
- banner="Resolving snapshot versions"
- ignoreFailures="true"
- />
- </goal>
-
- <goal name="maven:plugin-validate-pom-for-release"
- description="Validate the Plugin POMs for release.">
-
- <maven:reactor
- basedir="${maven.src.dir}/plugins-build"
- includes="*/project.xml"
- goals="validate-pom-for-release"
- banner="Resolving snapshot versions"
- ignoreFailures="false"
- />
- </goal>
-
- <goal name="maven:plugin-increment-snapshot-version"
- description="Graduate Plugin currentVersion element.">
-
- <maven:reactor
- basedir="${maven.src.dir}/plugins-build"
- includes="*/project.xml"
- goals="increment-snapshot-version"
- banner="Graduating snapshot version"
- ignoreFailures="true"
- />
- </goal>
-
- <!-- ================================================================== -->
- <!-- G E N E R A T E P L U G I N D O C U M E N T A T I O N -->
- <!-- ================================================================== -->
-
- <goal name="maven:plugin-docs"
- description="Build each Maven plugin's documentation">
-
- <maven:reactor
- basedir="${maven.src.dir}/plugins-build"
- includes="*/project.xml"
- goals="xdoc"
- banner="Generating Docs For"
- ignoreFailures="false"
- />
-
- </goal>
-
<!-- ================================================================== -->
<!-- R U N P L U G I N T E S T S -->
<!-- ================================================================== -->
@@ -191,175 +113,5 @@
<attainGoal name="install:from-web"/>
-->
</goal>
-
- <!-- ================================================================== -->
- <!-- M A V E N I N S T A L L E R -->
- <!-- ================================================================== -->
-
- <property name="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
-
- <goal name="maven:installer" description="Create a Maven installer jar">
-
- <property name="installersDir" value="installers"/>
- <property name="installersBase" value="${installersDir}/${tag}"/>
-
- <delete dir="${installersDir}"/>
- <mkdir dir="${installersBase}"/>
-
- <copy todir="${installersBase}">
- <fileset dir="${maven.home}">
- <include name="plugins/*.jar"/>
- <include name="bin/*"/>
- <include name="lib/**"/>
- <include name="maven-project-*.xsd"/>
- </fileset>
- </copy>
-
- <mkdir dir="${installersBase}/repository"/>
-
- <tar longfile="gnu" tarfile="${tag}.tar">
- <tarfileset dir="${installersDir}">
- <exclude name="**/maven"/>
- </tarfileset>
- <tarfileset dir="${installersDir}" mode="755">
- <include name="**/maven"/>
- </tarfileset>
- </tar>
-
- <gzip
- zipfile="${tag}.tar.gz"
- src="${tag}.tar"
- />
- <copy
- file="${maven.build.dir}/${maven.final.name}.jar"
- todir="${maven.home}/plugins"
- />
-
- <delete file="${tag}.tar"/>
-
- <!-- Create a zip file -->
- <zip zipfile="${tag}.zip">
- <zipfileset dir="${installersDir}"/>
- </zip>
-
- </goal>
-
- <goal name="maven:installer-deploy"
- description="Deploy an installable Maven jar to the remote repo??">
-
- <maven:user-check user="${maven.username}"/>
- <attainGoal name="maven:installer"/>
-
- <tar longfile="gnu" tarfile="installers.tar">
- <tarfileset dir="${basedir}">
- <include name="${tag}.tar.gz"/>
- <include name="${tag}.zip"/>
- </tarfileset>
- </tar>
-
- <deploy:artifact
- artifact="installers.tar"
- type="distributions"
- assureDirectoryCommand="mkdir -p"
- siteCommand="cd @deployDirectory@;tar xUvf installers.tar;chmod -R g+u *;rm
installers.tar"
- />
-
- </goal>
-
- <!--
- These two goals are the start of the merge of plugin docs and
- the main maven documentation. pre-xdoc-transform will be changed
- from a 'goal' to a 'preGoal' on 'xdoc:transform'.
- 'postSite' will be changed to a 'postGoal' on 'site'.
-
- Plugin docs will generated and then copied into
- target/docs/reference/plugins/${plugin}/
-
- A simple home page listing the plugins and linking to their
- docs will be generated in pre xdoc:transform, and processed into
- target/docs/reference/plugins/index.html
- -->
-
- <preGoal name="xdoc:transform">
- <attainGoal name="multiproject:create-overview-page"/>
- </preGoal>
-
- <preGoal name="xdoc">
- <j:if test="${pluginSite != null}">
-
- <maven:reactor
- basedir="${basedir}"
- includes="src/plugins-build/*/project.xml"
- goals="site"
- banner="Generating site for"
- ignoreFailures="false"
- />
-
- <!-- create the parent directory for the docs -->
- <mkdir dir="${maven.docs.dest}/reference/plugins" />
-
- <!-- copy them all to ${maven.docs.dest}/reference/plugins/${plugin.id}/ -->
- <ant:fileScanner var="pluginProjects">
- <fileset dir="${basedir}">
- <include name="src/plugins-build/*/project.xml" />
- </fileset>
- </ant:fileScanner>
- <j:forEach items="${pluginProjects.iterator()}" var="plugin">
- <j:set var="pluginName" value="${plugin.parentFile.name}" />
- <mkdir dir="${maven.docs.dest}/reference/plugins/${pluginName}/" />
- <copy toDir="${maven.docs.dest}/reference/plugins/${pluginName}/">
- <fileset dir="src/plugins-build/${pluginName}/target/docs/">
- <include name="**" />
- </fileset>
- </copy>
- </j:forEach>
- </j:if>
- </preGoal>
-
- <!-- ================================================================== -->
- <!-- M A V E N D I S T R I B U T I O N T E S T A I D S -->
- <!-- ================================================================== -->
- <!-- NOTE: -->
- <!-- Make sure you get rid of as many (all ideally) SNAPSHOT jars -->
- <!-- as possible. -->
- <!-- ================================================================== -->
- <!-- 1. (Re)move current Maven installation -->
- <!-- 2. Bootstrap -->
- <!-- 3. maven maven:installer -->
- <!-- 4. Install maven (with the freshly created installer) -->
- <!-- 5. maven -->
- <!-- 6. maven site -->
- <!-- ================================================================== -->
-
- <postGoal name="java:jar-resources">
- <j:if test="${maven.test.distribution}">
- <echo>Using test log4j.properties file ...</echo>
- <copy
- file="src/test/log4j.properties"
- todir="${maven.build.dest}"
- overwrite="true"
- />
- </j:if>
- </postGoal>
-
- <!-- Use build:start hook to nuke the debug log files -->
-
- <!--
- <postGoal name="build:start">
- <j:if test="${maven.test.distribution}">
- <delete>
- <fileset dir="${basedir}">
- <include name="log*"/>
- </fileset>
- </delete>
- </j:if>
- </postGoal>
- -->
-
- <!--
- <preGoal name="site:generate">
- <attainGoal name="clover"/>
- </preGoal>
- -->
</project>
1.50 +9 -1 maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven/project.properties,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- project.properties 28 Oct 2003 00:11:28 -0000 1.49
+++ project.properties 24 Nov 2003 20:18:00 -0000 1.50
@@ -67,4 +67,12 @@
#------------------------------------------------------------------
# H T M L 2 X D O C P R O P E R T I E S
#------------------------------------------------------------------
-maven.html2xdoc.enable=true
\ No newline at end of file
+maven.html2xdoc.enable=true
+
+#------------------------------------------------------------------
+# B O O T S T R A P
+#------------------------------------------------------------------
+
+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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
