antlets build.xml,1.7,1.8

[email protected] Wed, 10 Mar 2004 06:30:32 -0800
Newsgroups gmane.comp.krysalis.metamorphosis.cvs
Message-ID <[email protected]>
Update of /cvsroot/metamorphosis/antlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6693

Modified Files:
	build.xml 
Log Message:
os independent regexp for copy of xdocs files

Index: build.xml
===================================================================
RCS file: /cvsroot/metamorphosis/antlets/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml	10 Mar 2004 12:25:14 -0000	1.7
--- build.xml	10 Mar 2004 14:30:30 -0000	1.8
***************
*** 76,113 ****
  	</target>
  	
! 	<target name="antletdocs" description="generates documentation for antlets">
! 		<!-- Execute the makeantlet.antletdocs target for every antlet in this project -->
! 		<!-- Direct the intermediate xdoc output to the build dir for further processing -->
! 		
! 		<!-- rewrite this whole build file. it is not really homogen now. 
! 		     This is a quick setup in order to allow both: 
! 		     - running this file to install antlets in the first place
! 		     - using the installed antlets already within this build -->
! 		      
! 	    <!--ant dir="makeantlet" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="init" antfile="build.xml" target="antletdocs" />
! 	    <ant dir="java" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="forrest" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="jaxb" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="jdepend" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="pmd" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="ruperDepend" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="scripts" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="version" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="webapp" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="xdoclet" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="cvsbuild" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="javasrc" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="checkstyle" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="junit" antfile="build.xml" target="antletdocs"/>
! 	    <ant dir="jalopy" antfile="build.xml" target="antletdocs"/-->
! 	    
  		<mkdir dir="${base.xdocs.dir}"/>	
  		<!-- copy the generated xdocs files from the specific antlets to a common input dir for forrest: -->	
  	    <copy todir="${base.xdocs.dir}" overwrite="yes" >
      		<fileset dir="${basedir}"/>   
!     		<!-- TODO: make this OS-independent! this regexp works on windows only-->
!     		<!-- TODO: once the antlet sources are moved to src. it is sufficient to look there and simplify this -->
! 	    	<mapper type="regexp" from="build\\([^\\]+)\\xdocs\\([^\\]*xml)$$" to="\1\\\2"/>	    	
  	    </copy>
  	    <!-- copy static forrest content to the common input dir -->
--- 76,102 ----
  	</target>
  	
! 	
! 	<!-- rewrite this whole build file. 
! 	     This is a quick setup in order to allow both: 
! 	     - running this file to install antlets in the first place
! 	     - using the installed antlets already within this build 
! 	     You might also consider a generic clean target in the init antlet. -->
! 	
! 	<target name="antletdocs" description="generates documentation for antlets">	    
  		<mkdir dir="${base.xdocs.dir}"/>	
  		<!-- copy the generated xdocs files from the specific antlets to a common input dir for forrest: -->	
+ 		
+     	<!-- the conditional setting of file separator is required for the regexp. -->
+ 		<condition property="my.sep" value="\\">		
+ 			<os family="windows"/>
+ 		</condition>
+ 		<condition property="my.sep" value="/">		
+ 			<os family="unix"/>
+ 		</condition>
+ 		
  	    <copy todir="${base.xdocs.dir}" overwrite="yes" >
      		<fileset dir="${basedir}"/>   
!     		<!-- TODO: once the antlet sources are moved to src. it is sufficient to look there and simplify this -->    		
! 	    	<mapper type="regexp" from="build${my.sep}([^${my.sep}]+)${my.sep}xdocs${my.sep}([^${my.sep}]*xml)$$" to="\1${my.sep}\2"/>	    	
  	    </copy>
  	    <!-- copy static forrest content to the common input dir -->



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click