Return-Path: 
 <avalon-cvs-return-9251-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 74721 invoked from network); 1 Aug 2002 21:13:55 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 1 Aug 2002 21:13:55 -0000
Received: (qmail 12011 invoked by uid 97); 1 Aug 2002 21:14:20 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 11995 invoked by uid 97); 1 Aug 2002 21:14:19 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 11984 invoked by uid 97); 1 Aug 2002 21:14:19 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 1 Aug 2002 21:13:50 -0000
Message-ID: <20020801211350.41945.qmail@icarus.apache.org>
From: proyal@apache.org
To: jakarta-avalon-apps-cvs@apache.org
Subject: cvs commit: jakarta-avalon-apps build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>