From: Michael D. <mik...@us...> - 2005-04-25 03:26:54
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/NHibernate Modified Files: NHibernate.build Log Message: upgraded to nant-0.85-rc3 Index: NHibernate.build =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.build,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NHibernate.build 21 Apr 2005 06:50:27 -0000 1.11 --- NHibernate.build 25 Apr 2005 03:26:36 -0000 1.12 *************** *** 4,8 **** name="NHibernate" default="build" ! xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd" > --- 4,8 ---- name="NHibernate" default="build" ! xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd" > *************** *** 20,27 **** * clover.src - location of the clovered source to be stored at from the root of nhibernate * clover.db - location of the coverage db from the root of nhibernate --> ! <if propertytrue="clover.enabled"> ! <loadtasks assembly="${clover.home}/CloverNAnt-0.84.dll" /> </if> --- 20,28 ---- * clover.src - location of the clovered source to be stored at from the root of nhibernate * clover.db - location of the coverage db from the root of nhibernate + * clover.assembly - assembly that contains clover tasks for this version of NAnt --> ! <if test="${clover.enabled}"> ! <loadtasks assembly="${clover.home}/${clover.assembly}" /> </if> *************** *** 30,34 **** <target name="build" description="Build NHibernate"> ! <if propertytrue="clover.enabled"> <clover-setup initstring="..\..\${clover.db}" --- 31,35 ---- <target name="build" description="Build NHibernate"> ! <if test="${clover.enabled}"> <clover-setup initstring="..\..\${clover.db}" *************** *** 44,51 **** <asminfo output="AssemblyInfo.cs" language="CSharp"> <imports> ! <import name="System" /> ! <import name="System.Reflection" /> ! <import name="System.Runtime.CompilerServices" /> ! <import name="System.Runtime.InteropServices" /> </imports> <attributes> --- 45,52 ---- <asminfo output="AssemblyInfo.cs" language="CSharp"> <imports> ! <import namespace="System" /> ! <import namespace="System.Reflection" /> ! <import namespace="System.Runtime.CompilerServices" /> ! <import namespace="System.Runtime.InteropServices" /> </imports> <attributes> *************** *** 70,75 **** output="${build.dir}/bin/${nant.project.name}.dll" doc="${build.dir}/bin/${nant.project.name}.xml" - nowarn="1573,1591" > <!-- Documentation related warnings. Basically it's not going to output a warning when there --- 71,79 ---- output="${build.dir}/bin/${nant.project.name}.dll" doc="${build.dir}/bin/${nant.project.name}.xml" > + <nowarn> + <warning number="1573" /> + <warning number="1591" /> + </nowarn> <!-- Documentation related warnings. Basically it's not going to output a warning when there *************** *** 92,116 **** <sources failonempty="true"> ! <includes name="**/*.cs" /> ! <excludes name="Dialect/HSQLDialect.cs" /> ! <excludes name="Dialect/InterbaseDialect.cs" /> ! <excludes name="Dialect/SAPDBDialect.cs" /> ! <excludes name="Tool/hbm2net/*.cs" /> </sources> <resources prefix="NHibernate" dynamicprefix="true"> ! <includes name="*.xsd" /> ! <includes name="**/*.xml" /> ! <excludes name="bin/**/*.xml" /> </resources> <references basedir="${build.dir}/bin"> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" /> ! <includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" /> ! <includes name="Iesi.Collections.dll" /> ! <includes name="log4net.dll" /> ! <includes name="HashCodeProvider.dll" /> ! <includes name="Castle.DynamicProxy.dll" /> </references> --- 96,120 ---- <sources failonempty="true"> ! <include name="**/*.cs" /> ! <exclude name="Dialect/HSQLDialect.cs" /> ! <exclude name="Dialect/InterbaseDialect.cs" /> ! <exclude name="Dialect/SAPDBDialect.cs" /> ! <exclude name="Tool/hbm2net/*.cs" /> </sources> <resources prefix="NHibernate" dynamicprefix="true"> ! <include name="*.xsd" /> ! <include name="**/*.xml" /> ! <exclude name="bin/**/*.xml" /> </resources> <references basedir="${build.dir}/bin"> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" /> ! <include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" /> ! <include name="Iesi.Collections.dll" /> ! <include name="log4net.dll" /> ! <include name="HashCodeProvider.dll" /> ! <include name="Castle.DynamicProxy.dll" /> </references> |