mcconnell 2003/08/22 04:09:50
Modified: framework maven.xml README.TXT
Log:
Small improvements to script to ensure any published goal can be called safely.
Revision Changes Path
1.2 +14 -14 avalon-sandbox/framework/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 21 Aug 2003 18:07:47 -0000 1.1
+++ maven.xml 22 Aug 2003 11:09:49 -0000 1.2
@@ -1,4 +1,4 @@
-<project default="build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<ant:property name="maven.ui.banner.background" value="#fff"/>
<ant:property name="maven.ui.banner.foreground" value="#000"/>
@@ -51,7 +51,7 @@
ignoreFailures="false"/>
</goal>
- <goal name="avalon:dist">
+ <goal name="avalon:dist" prereqs="avalon:site">
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
@@ -59,16 +59,6 @@
goals="xdist"
banner="Building distribution:"
ignoreFailures="false"/>
- <maven:reactor
- basedir="${basedir}"
- includes="site/project.xml"
- goals="site"
- banner="Building site:"
- ignoreFailures="false"/>
- <attainGoal name="ximport"/>
- </goal>
-
- <goal name="ximport">
<ant:mkdir dir="${maven.build.dir}"/>
<ant:copy toDir="${maven.build.dir}">
<fileset dir="${basedir}/api/target/distributions">
@@ -80,15 +70,25 @@
<include name="*.*"/>
</fileset>
</ant:copy>
+ </goal>
+
+ <goal name="avalon:site" prereqs="avalon:build">
+ <ant:mkdir dir="${maven.build.dir}"/>
+ <maven:reactor
+ basedir="${basedir}"
+ includes="site/project.xml"
+ goals="site"
+ banner="Building site:"
+ ignoreFailures="false"/>
<j:set var="docs.name" value="${maven.final.name}-docs"/>
- <ant:echo>Building doc kit: ${docs.name}.zip</ant:echo>
+ <ant:echo>Building doc package: ${docs.name}.zip</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${docs.name}.zip">
<zipfileset dir="${basedir}/site/target/docs" prefix="docs"/>
</ant:zip>
</goal>
<goal
- name="xdist:prepare-bin-filesystem" prereqs="jar:jar"
+ name="xdist:prepare-bin-filesystem"
description="Builds the jar files.">
<ant:delete dir="${maven.dist.bin.assembly.dir}"/>
1.2 +7 -1 avalon-sandbox/framework/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 21 Aug 2003 18:07:47 -0000 1.1
+++ README.TXT 22 Aug 2003 11:09:49 -0000 1.2
@@ -7,7 +7,13 @@
---------------
avalon:build - build from sources, jar and install into the local
Maven repository
- avalon:build-snapshot - build and install a snapshot jars
+ [reactor jar:install]
+ avalon:build-snapshot - build and install snapshot jars
+ [reactor jar:install-snapshot]
+ avalon:site - build the site
+ [prereqs: avalon:build]
avalon:dist - build the distribution under ${basedir}/target
+ [prereqs: avalon:site]
avalon:clean - clean this project and all subprojects
+ [reactor clean:clean]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
