proyal 2002/08/01 14:13:50
Modified: . build.xml
Log:
Call the overriden jar and sar methods if need be. This
is needed for proper support of the dist, etc tasks
Revision Changes Path
1.5 +21 -9 jakarta-avalon-apps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 1 Aug 2002 20:45:40 -0000 1.4
+++ build.xml 1 Aug 2002 21:13:50 -0000 1.5
@@ -46,7 +46,7 @@
<include name="*.jar" />
</fileset>
</path>
-
+
<path id="tools.class.path">
<path refid="project.class.path"/>
<fileset dir="${tools.lib}">
@@ -59,7 +59,7 @@
<taskdef name="sar"
classname="org.apache.avalon.phoenix.tools.tasks.Sar">
<classpath refid="project.class.path" />
</taskdef>
-
+
<taskdef name="phoenix-blocks"
classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
classpathref="project.class.path"/>
@@ -172,8 +172,14 @@
DISTRIBUTION TARGETS
==========================================================================================
-->
+ <target name="module:jar" depends="module:override-jar,module:real-jar"
unless="override.jar"/>
+
+ <target name="module:override-jar" depends="test-xdoclet,
module:phoenix-xdoclet, module:no-phoenix-xdoclet,module:setup" if="override.jar">
+ <ant antfile="${basedir}/build.xml" target="jar"/>
+ </target>
+
<!-- Jars up project -->
- <target name="module:jar" depends="test-xdoclet, module:phoenix-xdoclet,
module:no-phoenix-xdoclet,module:setup" unless="override.jar">
+ <target name="module:real-jar" depends="test-xdoclet, module:phoenix-xdoclet,
module:no-phoenix-xdoclet,module:setup" unless="override.jar">
<echo
message="-------------------------------------------------------------" />
<echo message="INFO: Creating jar file for ${Name}" />
<echo message=" generated file: ${build.lib}/${name}.jar" />
@@ -192,8 +198,14 @@
</jar>
</target>
+ <target name="module:sar" depends="module:override-sar,module:real-sar"
unless="override.sar"/>
+
+ <target name="module:override-sar" depends="module:jar,module:setup"
if="override.sar">
+ <ant antfile="${basedir}/build.xml" target="sar"/>
+ </target>
+
<!-- Sars up project -->
- <target name="module:sar" depends="module:jar,module:setup"
unless="override.sar">
+ <target name="module:real-sar" depends="module:jar,module:setup"
unless="override.sar">
<echo
message="-------------------------------------------------------------" />
<echo message="INFO: Creating sar file for ${Name}" />
<echo message=" generated file: ${build.lib}/${name}.sar" />
@@ -449,10 +461,10 @@
<filter token="link3.href" value=""/>
<filter token="group-logo.src" value="images/jakarta-logo.gif"/>
<filter token="group-logo.href" value="http://jakarta.apache.org/"/>
- <filter token="project-logo.src" value="images/header.gif"/>
- <filter token="project-logo.href"
value="http://jakarta.apache.org/avalon/"/>
- <filter token="year" value="2002"/>
- <filter token="vendor" value="Apache Software Foundation"/>
+ <filter token="project-logo.src" value="images/header.gif"/>
+ <filter token="project-logo.href"
value="http://jakarta.apache.org/avalon/"/>
+ <filter token="year" value="2002"/>
+ <filter token="vendor" value="Apache Software Foundation"/>
<filter token="year" value="${year}"/>
<filter token="AVALON_BASE" value="${avalon.base}"/>
@@ -467,7 +479,7 @@
<target name="cocoon:setup-html-docs"
depends="cocoon:setup-filters,cocoon:setup" description="generates the xdocs-based
documentation">
<delete dir="${cocoon.work}"/>
-
+
<mkdir dir="${build.dir}"/>
<mkdir dir="${cocoon.build.context}"/>
<mkdir dir="${cocoon.build.docs}"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
