You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2004/06/18 15:47:47 UTC

cvs commit: jakarta-hivemind/common forrest.xml project.xml

hlship      2004/06/18 06:47:47

  Modified:    common   forrest.xml project.xml
  Log:
  Move the site target from forrest.xml to project.xml.
  
  Revision  Changes    Path
  1.4       +8 -19     jakarta-hivemind/common/forrest.xml
  
  Index: forrest.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/forrest.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- forrest.xml	28 May 2004 21:41:11 -0000	1.3
  +++ forrest.xml	18 Jun 2004 13:47:47 -0000	1.4
  @@ -14,25 +14,6 @@
   				<property name="forrest.home" location="${forrest-package-dir}"/>
   			</ant>			
   		</target>
  -
  -		<target name="site" description="Build site documentation using Forrest.">
  -		
  -			<unpacked-zip-dependency
  -					url="http://www.apache.org/dist/xml/forrest/binaries"
  -					zip="apache-forrest-0.5.1-bin.zip"
  -					dir="${forrest-package-dir}"/>
  -			
  -			<antcall target="marshall-documentation"/>
  -			<antcall target="run-forrest"/>
  -		</target>
  -		
  -		<target name="-initialize-report-menu-file">
  -		
  -			<mkdir dir="${root.forrest.xdocs.dir}"/>
  -			
  -			<echo message="" file="${forrest.report-menu.file}"/>
  -			
  -		</target>
   		
   		<macrodef name="add-report-to-menu">
   			<attribute name="element" default="report" description="Element name to use inside site.xml, useful when creating a link to the report."/>
  @@ -46,6 +27,14 @@
   			</sequential>	
   		</macrodef>
   		
  +		<target name="-initialize-report-menu-file">
  +		
  +			<mkdir dir="${root.forrest.xdocs.dir}"/>
  +			
  +			<echo message="" file="${forrest.report-menu.file}"/>
  +			
  +		</target>  
  +        
   		<target name="marshall-documentation"
   			depends="-initialize-report-menu-file"
   			description="Copy static content into the forrest composite, and generate dynamic reports.">
  
  
  
  1.5       +12 -6     jakarta-hivemind/common/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	28 May 2004 21:41:11 -0000	1.4
  +++ project.xml	18 Jun 2004 13:47:47 -0000	1.5
  @@ -54,14 +54,20 @@
   		
   	</target>
   	
  -	<target name="site" description="Create project documentation.">
  -	
  -		<antcall target="forrest.site"/>	
  -	</target>
  -	
   	<target name="marshall-documentation" description="Marshall documentation in the project and in each module.">
   		<antcall target="forrest.marshall-documentation"/>
   		<reinvoke-ant target="marshall-documentation"/>
   	</target>
   	
  +		<target name="site" description="Build site documentation using Forrest.">
  +		
  +			<unpacked-zip-dependency
  +					url="http://www.apache.org/dist/xml/forrest/binaries"
  +					zip="apache-forrest-0.5.1-bin.zip"
  +					dir="${forrest-package-dir}"/>
  +			
  +			<antcall target="marshall-documentation"/>
  +			<antcall target="run-forrest"/>
  +		</target>
  +		
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org