You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ah...@apache.org on 2005/08/15 03:47:31 UTC
svn commit: r232688 - in /maven/maven-1/core/trunk: maven.xml project.xml
Author: aheritier
Date: Sun Aug 14 18:47:26 2005
New Revision: 232688
URL: http://svn.apache.org/viewcvs?rev=232688&view=rev
Log:
PDF plugin : replace the post goal with the report.
Modified:
maven/maven-1/core/trunk/maven.xml
maven/maven-1/core/trunk/project.xml
Modified: maven/maven-1/core/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/maven.xml?rev=232688&r1=232687&r2=232688&view=diff
==============================================================================
--- maven/maven-1/core/trunk/maven.xml (original)
+++ maven/maven-1/core/trunk/maven.xml Sun Aug 14 18:47:26 2005
@@ -15,150 +15,81 @@
* limitations under the License.
*/
-->
-<project
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:x="jelly:xml"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
-
+<project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:x="jelly:xml" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
<preGoal name="java:jar-resources">
- <ant:filter token="pom.currentVersion" value="${pom.currentVersion}" />
+ <ant:filter token="pom.currentVersion" value="${pom.currentVersion}"/>
</preGoal>
-
<postGoal name="site">
<ant:copy todir="${maven.docs.dest}">
- <ant:fileset dir="${basedir}/src/xsd" />
+ <ant:fileset dir="${basedir}/src/xsd"/>
</ant:copy>
- <attainGoal name="pdf"/>
</postGoal>
-
<goal name="maven:run-touchstone">
- <maven:maven
- descriptor="${basedir}/src/test/touchstone-build/project.xml"
- goals="clean,jar:jar,touchstone-tests"
- ignoreFailures="false"
- />
+ <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 -->
<!-- ================================================================== -->
<!-- Used by the bootstrap process to build all of Maven's plugins. -->
<!-- ================================================================== -->
-
- <goal
- name="maven:plugins-build"
- description="Build each Maven plugin into an installable jar">
-
- <maven:reactor
- basedir="${maven.plugins.directory}"
- includes="${maven.plugins.includes}"
- excludes="${maven.plugins.excludes}"
- goals="clean,plugin"
- banner="Building"
- ignoreFailures="false"
- />
+ <goal name="maven:plugins-build" description="Build each Maven plugin into an installable jar">
+ <maven:reactor basedir="${maven.plugins.directory}" includes="${maven.plugins.includes}" excludes="${maven.plugins.excludes}" goals="clean,plugin" banner="Building" ignoreFailures="false"/>
</goal>
-
- <goal
- name="maven:plugins-test"
- description="Test each Maven plugin">
-
+ <goal name="maven:plugins-test" description="Test each Maven plugin">
<!-- Exclude broken plugin tests (some only broken inside the reactor -->
<j:set var="excludes" value="${maven.plugins.excludes},dashboard/**,dist/**,ear/**,hibernate/**,pdf/**"/>
-
- <maven:reactor
- basedir="${maven.plugins.directory}"
- includes="${maven.plugins.includes}"
- excludes="${excludes}"
- goals="plugin:test"
- banner="Testing"
- ignoreFailures="false"
- />
+ <maven:reactor basedir="${maven.plugins.directory}" includes="${maven.plugins.includes}" excludes="${excludes}" goals="plugin:test" banner="Testing" ignoreFailures="false"/>
</goal>
-
- <goal
- name="maven:plugins-install"
- description="Install each Maven plugin">
-
- <maven:reactor
- basedir="${maven.plugins.directory}"
- includes="${maven.plugins.includes}"
- excludes="${maven.plugins.excludes}"
- goals="clean,plugin:install"
- banner="Installing"
- ignoreFailures="false"
- />
+ <goal name="maven:plugins-install" description="Install each Maven plugin">
+ <maven:reactor basedir="${maven.plugins.directory}" includes="${maven.plugins.includes}" excludes="${maven.plugins.excludes}" goals="clean,plugin:install" banner="Installing" ignoreFailures="false"/>
</goal>
-
- <goal name="maven:plugins-clean"
- description="Cleans all plugin projects">
-
- <maven:reactor
- basedir="${maven.plugins.directory}"
- includes="${maven.plugins.includes}"
- excludes="${maven.plugins.excludes}"
- goals="clean"
- banner="Building"
- ignoreFailures="false"
- />
+ <goal name="maven:plugins-clean" description="Cleans all plugin projects">
+ <maven:reactor basedir="${maven.plugins.directory}" includes="${maven.plugins.includes}" excludes="${maven.plugins.excludes}" goals="clean" banner="Building" ignoreFailures="false"/>
</goal>
-
- <goal name="maven:jar-install"
- description="Compile Maven and put a new jar in ${maven.home}/lib.">
+ <goal name="maven:jar-install" description="Compile Maven and put a new jar in ${maven.home}/lib.">
<attainGoal name="jar:jar"/>
- <copy file="${maven.build.dir}/${maven.final.name}.jar"
- tofile="${maven.home}/lib/${maven.final.name}.jar"
- overwrite="yes"/>
- <copy file="${maven.build.dir}/${maven.final.name}.jar"
- tofile="${maven.repo.local}/maven/jars/${maven.final.name}.jar"
- overwrite="yes"/>
+ <copy file="${maven.build.dir}/${maven.final.name}.jar" tofile="${maven.home}/lib/${maven.final.name}.jar" overwrite="yes"/>
+ <copy file="${maven.build.dir}/${maven.final.name}.jar" tofile="${maven.repo.local}/maven/jars/${maven.final.name}.jar" overwrite="yes"/>
</goal>
-
<goal name="maven:build-install" prereqs="clean,jar:jar">
- <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}" />
- <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}" />
- <ant:delete dir="${installerDir}" />
- <ant:mkdir dir="${installerDir}" />
- <ant:mkdir dir="${installerDir}/bin" />
- <ant:mkdir dir="${installerDir}/lib" />
- <ant:mkdir dir="${installerDir}/plugins" />
-
+ <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
+ <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
+ <ant:delete dir="${installerDir}"/>
+ <ant:mkdir dir="${installerDir}"/>
+ <ant:mkdir dir="${installerDir}/bin"/>
+ <ant:mkdir dir="${installerDir}/lib"/>
+ <ant:mkdir dir="${installerDir}/plugins"/>
<ant:copy tofile="${installerDir}/maven-project-3.xsd" overwrite="yes" file="${basedir}/src/xsd/maven-v3_0_0.xsd"/>
-
<ant:copy todir="${installerDir}/bin">
- <ant:fileset dir="${basedir}/src/bin" />
+ <ant:fileset dir="${basedir}/src/bin"/>
</ant:copy>
-
<j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}" />
+ <j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.type=='jar'}">
- <ant:copy todir="${installerDir}/lib" file="${lib.path}" />
+ <ant:copy todir="${installerDir}/lib" file="${lib.path}"/>
</j:if>
</j:forEach>
- <ant:copy todir="${installerDir}/lib" file="${maven.build.dir}/${maven.final.name}.jar" />
-
- <attainGoal name="maven:generate-install-scripts" />
- <ant:copy todir="${installerDir}/bin" file="${maven.build.dir}/install_repo.bat" />
- <ant:copy todir="${installerDir}/bin" file="${maven.build.dir}/install_repo.sh" />
-
- <ant:fixcrlf srcdir="${installerDir}" eol="crlf" includes="**/*.bat" />
- <ant:fixcrlf srcdir="${installerDir}" eol="lf" includes="**/*.sh,**/maven" />
-
- <x:parse var="plugins" xml="${maven.plugins.profile}" />
+ <ant:copy todir="${installerDir}/lib" file="${maven.build.dir}/${maven.final.name}.jar"/>
+ <attainGoal name="maven:generate-install-scripts"/>
+ <ant:copy todir="${installerDir}/bin" file="${maven.build.dir}/install_repo.bat"/>
+ <ant:copy todir="${installerDir}/bin" file="${maven.build.dir}/install_repo.sh"/>
+ <ant:fixcrlf srcdir="${installerDir}" eol="crlf" includes="**/*.bat"/>
+ <ant:fixcrlf srcdir="${installerDir}" eol="lf" includes="**/*.sh,**/maven"/>
+ <x:parse var="plugins" xml="${maven.plugins.profile}"/>
<x:forEach var="plugin" select="$plugins/plugins/plugin">
- <j:set var="groupId"><x:expr select="@groupId" /></j:set>
- <j:set var="artifactId"><x:expr select="@artifactId" /></j:set>
- <j:set var="version"><x:expr select="@version" /></j:set>
+ <j:set var="groupId">
+ <x:expr select="@groupId"/>
+ </j:set>
+ <j:set var="artifactId">
+ <x:expr select="@artifactId"/>
+ </j:set>
+ <j:set var="version">
+ <x:expr select="@version"/>
+ </j:set>
<ant:echo>Downloading ${groupId}:${artifactId} version ${version}</ant:echo>
- <attainGoal name="plugin:download-artifact" />
- <ant:copy
- file="${maven.repo.local}/${groupId}/plugins/${artifactId}-${version}.jar"
- todir="${installerDir}/plugins"
- />
+ <attainGoal name="plugin:download-artifact"/>
+ <ant:copy file="${maven.repo.local}/${groupId}/plugins/${artifactId}-${version}.jar" todir="${installerDir}/plugins"/>
</x:forEach>
-
<ant:echo>Running touchstone against the new Maven install...</ant:echo>
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
@@ -172,54 +103,39 @@
</ant:exec>
</j:otherwise>
</j:choose>
- <ant:exec
- executable="${maven.bin.script}"
- failonerror="true">
- <ant:arg value="-Dmaven.home=${installerDir}" />
+ <ant:exec executable="${maven.bin.script}" failonerror="true">
+ <ant:arg value="-Dmaven.home=${installerDir}"/>
<ant:arg value="-Dmaven.home.local=${maven.build.dir}/home-local"/>
<ant:arg value="-Dmaven.repo.local=${maven.repo.local}"/>
<ant:arg value="maven:run-touchstone"/>
<ant:arg value="-e"/>
- <ant:env key="MAVEN_HOME" value="${installerDir}" />
+ <ant:env key="MAVEN_HOME" value="${installerDir}"/>
</ant:exec>
-
-<!-- Temporarily disabled - we cannot release this at Apache due to GPL libraries included
+ <!-- Temporarily disabled - we cannot release this at Apache due to GPL libraries included
<attainGoal name="maven:build-seed-repo" />
-->
</goal>
-
<goal name="maven:build-plugin-profile">
- <maven:reactor
- basedir="${maven.plugins.directory}"
- includes="${maven.plugins.includes}"
- excludes="${maven.plugins.excludes}"
- postProcessing="true"
- banner="Gathering"
- ignoreFailures="false"
- />
- <ant:copy tofile="${maven.plugins.profile}.bak" file="${maven.plugins.profile}" />
- <j:file name="${maven.plugins.profile}"
- omitXmlDeclaration="false"
- outputMode="xml"
- prettyPrint="true">
+ <maven:reactor basedir="${maven.plugins.directory}" includes="${maven.plugins.includes}" excludes="${maven.plugins.excludes}" postProcessing="true" banner="Gathering" ignoreFailures="false"/>
+ <ant:copy tofile="${maven.plugins.profile}.bak" file="${maven.plugins.profile}"/>
+ <j:file name="${maven.plugins.profile}" omitXmlDeclaration="false" outputMode="xml" prettyPrint="true">
<plugins>
<j:forEach var="reactorProject" items="${reactorProjects}">
- <j:set var="version" value="${reactorProject.versions[size(reactorProject.versions)-1]}" />
+ <j:set var="version" value="${reactorProject.versions[size(reactorProject.versions)-1]}"/>
<j:if test="${version.tag == 'HEAD'}">
- <j:set var="version" value="${reactorProject.versions[size(reactorProject.versions)-2]}" />
+ <j:set var="version" value="${reactorProject.versions[size(reactorProject.versions)-2]}"/>
</j:if>
<j:if test="${version == null}">
<ant:echo>WARNING: no version for ${reactorProject}</ant:echo>
</j:if>
<j:if test="${version != null}">
- <plugin artifactId="${reactorProject.artifactId}" groupId="maven" version="${version}" />
+ <plugin artifactId="${reactorProject.artifactId}" groupId="maven" version="${version}"/>
</j:if>
</j:forEach>
</plugins>
</j:file>
</goal>
-
-<!--
+ <!--
<goal name="maven:install">
<i:ask
question="Enter the installation directory (contents will be deleted): "
@@ -237,13 +153,12 @@
</ant:copy>
</goal>
-->
-
<goal name="maven:installer" prereqs="maven:build-install">
- <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}" />
- <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}" />
+ <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
+ <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
<ant:tar longfile="gnu" tarfile="${maven.build.dir}/installer/${tag}.tar">
<ant:tarfileset dir="${maven.build.dir}/installer">
- <ant:include name="${tag}/**" />
+ <ant:include name="${tag}/**"/>
<ant:exclude name="**/maven"/>
<ant:exclude name="**/install_repo.sh"/>
</ant:tarfileset>
@@ -252,24 +167,13 @@
<ant:include name="**/install_repo.sh"/>
</ant:tarfileset>
</ant:tar>
-
- <ant:bzip2
- zipfile="${maven.build.dir}/installer/${tag}.tar.bz2"
- src="${maven.build.dir}/installer/${tag}.tar"
- />
-
- <ant:gzip
- zipfile="${maven.build.dir}/installer/${tag}.tar.gz"
- src="${maven.build.dir}/installer/${tag}.tar"
- />
-
+ <ant:bzip2 zipfile="${maven.build.dir}/installer/${tag}.tar.bz2" src="${maven.build.dir}/installer/${tag}.tar"/>
+ <ant:gzip zipfile="${maven.build.dir}/installer/${tag}.tar.gz" src="${maven.build.dir}/installer/${tag}.tar"/>
<ant:delete file="${maven.build.dir}/installer/${tag}.tar"/>
-
<ant:zip zipfile="${maven.build.dir}/installer/${tag}.zip">
- <ant:zipfileset dir="${maven.build.dir}/installer" includes="${tag}/**" />
+ <ant:zipfileset dir="${maven.build.dir}/installer" includes="${tag}/**"/>
</ant:zip>
-
-<!--
+ <!--
<u:tokenize var="pluginList" delim=",">${maven.lite.plugins}</u:tokenize>
<j:set var="installerDirLite" value="${installerDir}-lite" />
@@ -312,14 +216,13 @@
<ant:zipfileset dir="${installerDirLite}" />
</ant:zip>
-->
-
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <j:set var="maven.dist.bin.assembly.dir" value="${installerDir}" />
- <attainGoal name="nsis" />
+ <j:set var="maven.dist.bin.assembly.dir" value="${installerDir}"/>
+ <attainGoal name="nsis"/>
<maven:get var="distDir" plugin="maven-dist-plugin" property="maven.dist.dir"/>
- <ant:copy tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe" file="${distDir}/${pom.artifactId}.exe" />
-<!--
+ <ant:copy tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe" file="${distDir}/${pom.artifactId}.exe"/>
+ <!--
<j:set var="maven.dist.bin.assembly.dir" value="${installerDirLite}" />
<attainGoal name="nsis" />
<ant:copy tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}-lite.exe" file="${maven.build.dir}/${pom.artifactId}.exe" />
@@ -330,27 +233,25 @@
</j:otherwise>
</j:choose>
</goal>
-
<goal name="maven:generate-install-scripts">
<j:file name="${maven.build.dir}/install_repo.sh" omitXmlDeclaration="true">
-<j:whitespace>#!/bin/sh
+ <j:whitespace>#!/bin/sh
REPO_DIR=$1
if [ -z "$REPO_DIR" ]; then echo "usage: $0 [repository directory]"; exit; fi
if [ -z "$MAVEN_HOME" ]; then echo "MAVEN_HOME must be set"; exit; fi
</j:whitespace>
-<j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}" />
- <j:set var="libdir" value="lib" />
- <j:if test="${dep.type=='jar'}">
-<j:whitespace>if [ ! -f $$REPO_DIR/${dep.groupId}/jars/${dep.artifactId}-${dep.version}.jar ]; then
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:set var="libdir" value="lib"/>
+ <j:if test="${dep.type=='jar'}">
+ <j:whitespace>if [ ! -f $$REPO_DIR/${dep.groupId}/jars/${dep.artifactId}-${dep.version}.jar ]; then
mkdir -p $$REPO_DIR/${dep.groupId}/jars
cp $$MAVEN_HOME/${libdir}/${dep.artifactId}-${dep.version}.jar $$REPO_DIR/${dep.groupId}/jars
fi
</j:whitespace>
- </j:if>
-</j:forEach>
+ </j:if>
+ </j:forEach>
</j:file>
-
<j:file name="${maven.build.dir}/install_repo.bat" omitXmlDeclaration="true">
<j:whitespace>@ECHO OFF
if %1a==a goto usage
@@ -366,17 +267,17 @@
REM this warns but works on WinNT+, should work on Win9x too
if not exist "%REPO_DIR%\nul" mkdir "%REPO_DIR%"
</j:whitespace>
-<j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}" />
- <j:set var="libdir" value="lib" />
- <j:if test="${dep.type=='jar'}">
-<j:whitespace>if not exist "%REPO_DIR%\${dep.groupId}\nul" mkdir "%REPO_DIR%\${dep.groupId}"
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:set var="libdir" value="lib"/>
+ <j:if test="${dep.type=='jar'}">
+ <j:whitespace>if not exist "%REPO_DIR%\${dep.groupId}\nul" mkdir "%REPO_DIR%\${dep.groupId}"
if not exist "%REPO_DIR%\${dep.groupId}\jars\nul" mkdir "%REPO_DIR%\${dep.groupId}\jars"
if not exist "%REPO_DIR%\${dep.groupId}\jars\${dep.artifactId}-${dep.version}.jar" copy "%MAVEN_HOME%\${libdir}\${dep.artifactId}-${dep.version}.jar" "%REPO_DIR%\${dep.groupId}\jars"
</j:whitespace>
- </j:if>
-</j:forEach>
-<j:whitespace>goto end
+ </j:if>
+ </j:forEach>
+ <j:whitespace>goto end
:MHusage
echo MAVEN_HOME must be set
:usage
@@ -385,24 +286,23 @@
</j:whitespace>
</j:file>
</goal>
-
<goal name="maven:build-seed-repo">
- <j:set var="prevRepoLocal" value="${maven.repo.local}" />
- <j:set var="prevRepoRemote" value="${maven.repo.remote}" />
- <j:set var="repoLocal" value="${basedir}/target/seed-repo" />
- <j:set var="repoRemote" value="file:${prevRepoLocal},${prevRepoRemote}" />
+ <j:set var="prevRepoLocal" value="${maven.repo.local}"/>
+ <j:set var="prevRepoRemote" value="${maven.repo.remote}"/>
+ <j:set var="repoLocal" value="${basedir}/target/seed-repo"/>
+ <j:set var="repoRemote" value="file:${prevRepoLocal},${prevRepoRemote}"/>
${systemScope.setProperty('maven.repo.local',repoLocal)}
${systemScope.setProperty('maven.repo.remote',repoRemote)}
- <ant:delete dir="${repoLocal}" />
- <maven:maven descriptor="src/test/touchstone-build/src/reactor-build/default/project.xml" goals="java:compile,site" />
- <ant:mkdir dir="${maven.build.dir}/installer" />
+ <ant:delete dir="${repoLocal}"/>
+ <maven:maven descriptor="src/test/touchstone-build/src/reactor-build/default/project.xml" goals="java:compile,site"/>
+ <ant:mkdir dir="${maven.build.dir}/installer"/>
<ant:tar tarfile="${maven.build.dir}/installer/seed-repo-maven-${pom.currentVersion}.tar.gz" compression="gzip" longfile="gnu">
<ant:tarfileset dir="${repoLocal}">
<j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}" />
+ <j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.type=='jar'}">
- <ant:exclude name="${dep.groupId}/jars/${dep.artifactId}-${dep.version}.jar" />
- <ant:exclude name="${dep.groupId}/jars/${dep.artifactId}-${dep.version}.jar.md5" />
+ <ant:exclude name="${dep.groupId}/jars/${dep.artifactId}-${dep.version}.jar"/>
+ <ant:exclude name="${dep.groupId}/jars/${dep.artifactId}-${dep.version}.jar.md5"/>
</j:if>
</j:forEach>
</ant:tarfileset>
@@ -410,11 +310,9 @@
${systemScope.setProperty('maven.repo.local','${prevRepoLocal}')}
${systemScope.setProperty('maven.repo.remote','${prevRepoRemote}')}
</goal>
-
<postGoal name="xdoc:copy-user-resources">
<ant:copy todir="${maven.docs.dest}">
- <ant:fileset dir="${basedir}/src/site" />
+ <ant:fileset dir="${basedir}/src/site"/>
</ant:copy>
</postGoal>
</project>
-
Modified: maven/maven-1/core/trunk/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=232688&r1=232687&r2=232688&view=diff
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Sun Aug 14 18:47:26 2005
@@ -677,6 +677,7 @@
<report>maven-jxr-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-license-plugin</report>
+ <report>maven-pdf-plugin</report>
<report>maven-tasklist-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org