Build process updates:

- build HashCodeProvider using <ilasm> task to avoid rebuilding it if nothing changed.
- extract nhibernate configuration properties into build-common/nhibernate-properties.xml.

SVN: trunk@2395

Author: Sergey Koshcheyev

build-common/common-project.xml

@@ -18,7 +18,7 @@
 
 		After including the file, a target should be defined to initialize
 		configuration variables according to the project being built.
-		The standard of this target is init (but any other name can be chosen).
+		The standard name of this target is init (but any other name can be chosen).
 		The init target should depend on (or call) target common.init defined
 		in this file.
 
@@ -29,19 +29,20 @@
 				if it exists.
 
 			- common.compile-dll
-				compile a DLL, generating the documentation and using Clover if enabled.
+				compile a DLL, generating the documentation file (.xml) and using Clover
+				if enabled.
 
-			- common.generate-assemblyinfo, common.generate-assemblyinfoversion
-				generate an AssemblyInfo.cs or AssemblyInfoVersion.cs file from
-				assembly.* NAnt properties.
+			- common.generate-assemblyinfo
+				generate an AssemblyInfo.cs file from assembly.* NAnt properties.
 
 			- common.run-tests
 				run compiled NUnit tests.
 
 		All compile/run targets put the output in bin.dir. Common.compile*
 		targets use source fileset with id="project.sources", assembly fileset
 		with id="project.references" and resource fileset with id="project.resources"
-		to compile the project. The source and resource filesets are optional.
+		to compile the project. The source and resource filesets are optional and
+		default to **/*.cs files and no files respectively.
 
 	</description>
 

build-common/common.xml

@@ -136,9 +136,7 @@
 	<property name="current.build.defines" value="${build.defines}" />
 
 	<!-- properties used to connect to database for testing -->
-	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2000Dialect" />
-	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" />
-	<property name="nhibernate.connection.connection_string" value="Server=(local);initial catalog=nhibernate;Integrated Security=SSPI" />
+	<include buildfile="nhibernate-properties.xml" />
 
 	<!-- named project configurations -->
 	<target name="set-debug-project-configuration" description="Perform a 'debug' build">

build-common/nhibernate-properties.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2000Dialect" />
+	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" />
+	<property name="nhibernate.connection.connection_string" value="Server=(local);initial catalog=nhibernate;Integrated Security=SSPI" />
+</project>

default.build

@@ -132,6 +132,12 @@
 	</target>
 
 	<target name="test" depends="init build" description="Runs all NHibernate tests for the current framework">
+		<!-- -->
+		<nant target="test">
+			<buildfiles refid="buildfiles.tests" />
+		</nant>
+		<!-- -->
+		<!--
 		<foreach item="File" property="buildfile">
 			<in>
 				<items refid="buildfiles.tests" />
@@ -144,6 +150,7 @@
 				</exec>
 			</do>
 		</foreach>
+		-->
 	</target>
 
 	<target name="coverage-report" description="Builds the Test Coverage reports"

src/HashCodeProvider/HashCodeProvider.build

@@ -23,10 +23,14 @@
 	</target>
 
 	<target name="build" depends="generate-assemblyinfo">
-		<exec 
-			program="${framework::get-framework-directory(framework::get-target-framework())}\ilasm"
-			commandline="HashCodeProvider.il /dll /output:..\..\lib\net\1.1\HashCodeProvider.dll /key:..\NHibernate.snk" 
-		/>
+		<ilasm
+			target="dll"
+			output="${root.dir}/lib/net/1.1/HashCodeProvider.dll"
+			keyfile="${key.file}">
+			<sources>
+				<include name="HashCodeProvider.il" />
+			</sources>
+		</ilasm>
 		<copy file="HashCodeProvider.license.txt" todir="../../lib/net/1.1" />
 	</target>