[Nhibernate-commit] nhibernate NHibernateSolution.build,1.19,1.20

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9503

Modified Files:
	NHibernateSolution.build 
Log Message:
Modified build files for new Iesi.Collections.Test and modified
how clover enabled builds are run.

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NHibernateSolution.build	2 Dec 2004 20:50:41 -0000	1.19
--- NHibernateSolution.build	8 Dec 2004 15:30:53 -0000	1.20
***************
*** 16,19 ****
--- 16,21 ----
  	-->
  	<property name="clover.enabled" value="false" />
+ 	<property name="clover.src" value="src\CloverSrc" />
+ 	<property name="clover.db" value="${clover.src}\clover.cdb" />
  	<property name="clover.home" value="C:/Program Files/Cenqua/Clover.NET" />
  	
***************
*** 89,94 ****
  	>
  		<nant target="build" buildfile="src/HashCodeProvider/HashCodeProvider.build" />
! 		<nant target="build" buildfile="src/Iesi.Collections/Iesi.Collections.build" />
! 		
  	</target>
  	
--- 91,96 ----
  	>
  		<nant target="build" buildfile="src/HashCodeProvider/HashCodeProvider.build" />
! 		<!-- the Iesi.Collections.build takes care of determining if this is a clover build or not -->
! 		<nant target="coverage-report" buildfile="src/Iesi.Collections/Iesi.Collections.build" />
  	</target>
  	
***************
*** 133,137 ****
  		<copy todir="${build.dir}/bin">
  			<fileset basedir="${lib.dir}">
! 				<includes name="Iesi.Collections.*" />
  				<includes name="log4net.*" />
  				<includes name="nunit.framework.*" />
--- 135,143 ----
  		<copy todir="${build.dir}/bin">
  			<fileset basedir="${lib.dir}">
! 				<!-- 
! 					excludes the Iesi.Collections because it is built during the build
! 					of NHibernate.  It is in the lib folder for vs.net convenience
! 				-->
! 				<excludes name="Iesi.Collections.*" />
  				<includes name="log4net.*" />
  				<includes name="nunit.framework.*" />
***************
*** 139,142 ****
--- 145,150 ----
  		</copy>
  		
+ 		<nant target="build" buildfile="src/Iesi.Collections/Iesi.Collections.build" />
+ 		<nant target="build" buildfile="src/Iesi.Collections.Test/Iesi.Collections.Test.build" />
  		<nant target="build" buildfile="src/NHibernate/NHibernate.build" />
  		<nant target="build" buildfile="src/NHibernate.DomainModel/NHibernate.DomainModel.build" />
***************
*** 172,175 ****
--- 180,184 ----
  
  		<nant target="test" buildfile="src/NHibernate.Test/NHibernate.Test.build" />
+ 		<nant target="test" buildfile="src/Iesi.Collections.Test/Iesi.Collections.Test.build" />
  		
  		<!--
***************
*** 182,187 ****
  		/>
  
! 		<!-- the NHibernate.build takes care of determining if this is a clover build or not -->
! 		<nant target="coverage-report" buildfile="src/NHibernate/NHibernate.build" />
  	</target>
  	
--- 191,220 ----
  		/>
  
! 		<if propertytrue="nunit2report.installed">
! 			<mkdir dir="${build.dir}/testresults" />
! 			<nunit2report out="${build.dir}/testresults/index.html" format="Frames" todir="${build.dir}/testresults">
! 				<fileset>
! 					<includes name="${build.dir}\bin\*results.xml" />
! 				</fileset>
! 			</nunit2report>
! 		</if>
! 		
! 		<!-- if this was a clover enabled build then generate the clover reports for it -->
! 		<call target="coverage-report" if="${clover.enabled}" />
! 		
! 	</target>
! 	
! 	<target name="coverage-report" description="Builds the Test Coverage reports">
! 			
! 		<mkdir dir="${build.dir}/clover" />
! 		<clover-setup 
! 			initstring="${clover.db}"
! 			flushinterval="1000"
! 		/>
! 		<clover-report>
! 			<current title="NHibernate Clover Report" output="${build.dir}/clover" >
! 				<format type="html" orderBy="Alpha" />
! 			</current>
! 		</clover-report>
  	</target>
  	
***************
*** 190,196 ****
--- 223,231 ----
  			<assemblies basedir="${build.dir}/bin">
  				<includes name="NHibernate.dll" />
+ 				<includes name="Iesi.Collections.dll" />
  			</assemblies>
  			<summaries>
  				<includes name="src/NHibernate/NamespaceSummary.xml" />
+ 				<includes name="src/Iesi.Collections/NamespaceSummary.xml" />
  			</summaries>
  			<documenters>
***************
*** 261,265 ****
  				-->
  				<excludes name="src/UnitTesting/**" />
! 				<excludes name="src/CloverBuild/**" />
  				
  				<includes name="src/**" />
--- 296,300 ----
  				-->
  				<excludes name="src/UnitTesting/**" />
! 				<excludes name="${clover.src}/**" />
  				
  				<includes name="src/**" />