Merge branch '3.4.x'

Author: hazzik

ShowBuildMenu.bat

@@ -52,12 +52,16 @@ echo D. Add a test configuration for SQLite (x86).
 echo E. Add a test configuration for SQLite (x64). [not recommended]
 echo F. Add a test configuration for PostgreSQL.
 echo G. Add a test configuration for Oracle.
+echo H. Add a test configuration for SQL Server Compact (x86).
+echo I. Add a test configuration for SQL Server Compact (x64).
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGX
-if errorlevel 7 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIX
+if errorlevel 9 goto main-menu
+if errorlevel 8 goto test-setup-sqlservercex64
+if errorlevel 7 goto test-setup-sqlservercex86
 if errorlevel 6 goto test-setup-oracle
 if errorlevel 5 goto test-setup-postgresql
 if errorlevel 4 goto test-setup-sqlitex64
@@ -73,6 +77,20 @@ set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
+:test-setup-sqlservercex86
+set CONFIG_NAME=SqlServerCe32
+set PLATFORM=AnyCPU
+set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
+set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
+goto test-setup-generic
+
+:test-setup-sqlservercex64
+set CONFIG_NAME=SqlServerCe64
+set PLATFORM=AnyCPU
+set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
+set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
+goto test-setup-generic
+
 :test-setup-firebirdx86
 set CONFIG_NAME=FireBird
 set PLATFORM=x86
@@ -259,14 +277,18 @@ echo F. NHibernate Trunk - PostgreSQL
 echo G. NHibernate Trunk - Oracle (32-bit)
 echo H. NHibernate Trunk - Oracle Managed (32-bit)
 echo I. NHibernate Trunk - Oracle Managed (64-bit)
-echo J. NHibernate Trunk - SQL Server ODBC (32-bit)
+echo J. NHibernate Trunk - SQL Server Compact (32-bit)
+echo K. NHibernate Trunk - SQL Server Compact (64-bit)
+echo L. NHibernate Trunk - SQL Server ODBC (32-bit)
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIJX
-if errorlevel 10 goto main-menu
-if errorlevel 9 goto teamcity-sqlServerOdbc
+%BUILDTOOL% prompt ABCDEFGHIJKLX
+if errorlevel 12 goto main-menu
+if errorlevel 11 goto teamcity-sqlServerOdbc
+if errorlevel 10 goto teamcity-sqlServerCe64
+if errorlevel 9 goto teamcity-sqlServerCe32
 if errorlevel 8 goto teamcity-oraclemanaged-64
 if errorlevel 7 goto teamcity-oraclemanaged-32
 if errorlevel 6 goto teamcity-oracle32
@@ -337,5 +359,17 @@ move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
 move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
 goto main-menu
 
+:teamcity-sqlServerCe32
+move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=sqlServerCe32
+move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
+goto main-menu
+
+:teamcity-sqlServerCe64
+move "%CURRENT_CONFIGURATION%" "%CURRENT_CONFIGURATION%-backup" 2> nul
+%NANT% /f:teamcity.build -D:skip.manual=true -D:CCNetLabel=-1 -D:config.teamcity=sqlServerCe64
+move "%CURRENT_CONFIGURATION%-backup" "%CURRENT_CONFIGURATION%" 2> nul
+goto main-menu
+
 :end
 popd

build-common/common-project.xml

@@ -301,6 +301,14 @@
 			</namespaces>
 		</xmlpoke>
 
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='command_timeout']"
+			value="${nhibernate.command_timeout}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+
 		<xmlpoke file="${app.config}"
 			xpath="//*/hbm:property[@name='connection.driver_class']"
 			value="${nhibernate.connection.driver_class}">

build-common/nhibernate-properties.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" ?>
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
 	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect"  overwrite="false"/>
+	<property name="nhibernate.command_timeout" value="444"  overwrite="false"/>
 	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
 	<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>