- Add an "installer" to integrate the documentation in VS .NET Help

- Update NAnt .build files to make them more "similar"


SVN: trunk@1709

NHibernateSolution.build

@@ -5,15 +5,20 @@
 	default="build"
 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
 >
+	<!-- 
+		Use this to determine if the key file NHibernate.key should be used to 
+		sign the Assemblies.  This defaults to false since users doing their own
+		build have _no_ copy of the private key.  If they do their own private
+		builds then they should make their own key 
+	-->
+	<property name="sign" value="false" />
+
 	<!-- 
 		if nunit2report tasks from http://nunit2report.sourceforge.net/ has been installed
 		then change this to true.  It generates a nice looking html report for the test files
 	-->
 	<property name="nunit2report.installed" value="false" overwrite="false" />
 
-	<!-- Disable performance tests by default. They take too much time. -->
-	<property name="run.performance.tests" value="false" overwrite="false" />
-
 	<!--
 		if Visual Studio Help Integration Kit has been installed
 		then change this to true or include -D:vshik.installed=true in the command line.
@@ -29,14 +34,8 @@
 	<property name="clover.db" value="${clover.src}\clover.cdb" />
 	<property name="clover.home" value="${environment::get-folder-path('ProgramFiles')}/Cenqua/Clover.NET for Visual Studio" />
 	<property name="clover.assembly" value="CloverNAnt-0.85.dll" />
-	<!-- 
-		Use this to determine if the key file NHibernate.key should be used to 
-		sign the Assemblies.  This defaults to false since users doing their own
-		build have _no_ copy of the private key.  If they do their own private
-		builds then they should make their own key 
-	-->
-	<property name="sign" value="false" overwrite="false" />
-
+
+
 	<!-- 
 		These are used to set the correct Attributes in AssemblyInfo.cs.  
 	-->
@@ -60,7 +59,13 @@
 	<!-- 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=localhost;initial catalog=nhibernate;Integrated Security=SSPI" />
+	<property name="nhibernate.connection.connection_string" value="Server=(local);initial catalog=nhibernate;Integrated Security=SSPI" />
+
+
+	<!-- Disable performance tests by default. They take too much time. -->
+	<property name="run.performance.tests" value="false" overwrite="false" />
+
+
 
 	<!-- named project configurations -->
 	<target name="debug" description="Perform a 'debug' build">

doc/Help2/Install Documentation In VS .NET Help.bat

@@ -0,0 +1,8 @@
+@echo off
+echo ------------------------------------------------------
+echo Install the documentation in Visual Studio .NET help
+echo Make sure that NAnt and H2Reg are correctly installed!
+echo ------------------------------------------------------
+echo ...
+NAnt install
+echo on

doc/Help2/Installer.build

@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<project 
+	name="NHibernate.Documentation.VSNET.Installer" 
+	default="install" 
+	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
+>
+	<!--
+		Find the path to the H2Reg executable. If H2Reg can not be found, you can:
+		- Modify .bat files to specify the path in the command line using -D:h2reg.path=<path>
+		- Add the path in PATH variable
+		- Copy H2Reg in this directory
+	-->
+	<ifnot test="${property::exists('h2reg.path')}">
+		<readregistry property="h2reg.path" key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\H2Refxx_is1\Inno Setup: App Path"
+			hive="LocalMachine" failonerror="false" />
+	</ifnot>
+
+	<target name="install" description="Install the documentation in Visual Studio .NET help.">
+		<property name="h2reg.arg" value="-r" overwrite="false" />
+		<call target="run-h2reg" />
+	</target>
+
+	<target name="uninstall" description="Uninstall the documentation from Visual Studio .NET help.">
+		<property name="h2reg.arg" value="-u" overwrite="false" />
+		<call target="run-h2reg" />
+	</target>
+
+	<target name="run-h2reg" description="Run the command.">
+		<if test="${property::exists('h2reg.path')}">
+			<exec program="H2Reg.exe" commandline="${h2reg.arg} CmdFile=${directory::get-current-directory()}\NHibernateCollection.ini" basedir="${h2reg.path}" verbose="true" />
+		</if>
+		<!-- Try without the path; it might be in this directory or in the PATH -->
+		<ifnot test="${property::exists('h2reg.path')}">
+			<exec program="H2Reg.exe" commandline="${h2reg.arg} CmdFile=${directory::get-current-directory()}\NHibernateCollection.ini" verbose="true" />
+		</ifnot>
+	</target>
+</project>

doc/Help2/Uninstall Documentation In VS .NET Help.bat

@@ -0,0 +1,8 @@
+@echo off
+echo --------------------------------------------------------
+echo Uninstall the documentation from Visual Studio .NET help
+echo Make sure that NAnt and H2Reg are correctly installed!
+echo --------------------------------------------------------
+echo ...
+NAnt uninstall
+echo on

releasenotes.txt

@@ -1,3 +1,8 @@
+In CVS
+========================
+- The documentation has an "installer" to integrate it in VS .NET Help.
+
+
 Build 0.99.1.0 (1.0-rc1)
 ========================
 

src/NHibernate.Test.Performance/.cvsignore

@@ -1,3 +1,5 @@
-NHibernate.Test.Performance-1.1.csproj.user
 bin
-obj
+obj
+.#*
+*.user
+*.xsx