Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPRNET-1454

Browse Source 
-add support for NH 3.2
This commit is contained in:
sbohlen
2011-07-07 17:20:13 +00:00
parent ab854b13de
commit 79f397b4a3
39 changed files with 2938 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Spring.build
View File

@@ -463,6 +463,7 @@ Commandline Examples:
<property name="nh21.lib.dir" value="${spring.basedir}/lib/NHibernate21/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh30.lib.dir" value="${spring.basedir}/lib/NHibernate30/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh31.lib.dir" value="${spring.basedir}/lib/NHibernate31/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<call target="copylibtobin"/>
<!-- build assemblies -->
@@ -478,6 +479,7 @@ Commandline Examples:
<nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
<nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
<nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing-nunit}"/>
<nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft and nant.settings.currentframework != 'net-1.1'}"/>
@@ -517,6 +519,14 @@ Commandline Examples:
if="${build-data and nant.settings.currentframework == 'net-4.0'}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate31.Integration.Tests/Spring.Data.NHibernate31.Integration.Tests.build" target="test"
if="${build-data and nant.settings.currentframework == 'net-4.0'}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build" target="test"
if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build" target="test"
if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build" target="test"
if="${build-data and nant.settings.currentframework == 'net-4.0'}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build" target="test"
if="${build-data and nant.settings.currentframework == 'net-4.0'}"/>
<nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services and not net-3.5}"/>
<nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
<nant buildfile="test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build" target="test" if="${nant.settings.currentframework == 'net-4.0'}"/>
@@ -597,6 +607,7 @@ Commandline Examples:
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh30.lib.dir" value="${spring.basedir}/lib/NHibernate30/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh31.lib.dir" value="${spring.basedir}/lib/NHibernate31/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<call target="copykeys" if="${project.build.sign}"/>
<call target="copylibs" />
<call target="common.generate-assemblyinfo"/>
@@ -620,6 +631,7 @@ Commandline Examples:
<nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build"/>
<nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data}" />
<nant buildfile="src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build" target="build" if="${build-data}" />
<nant buildfile="src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build" target="build" if="${build-data}" />
</target>
<target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
@@ -858,6 +870,8 @@ Commandline Examples:
<delete dir="src/Spring/Spring.Data.NHibernate30/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Data.NHibernate31/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Data.NHibernate31/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Data.NHibernate32/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Data.NHibernate32/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Services/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Services/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Messaging.Nms/obj" failonerror="false"/>
@@ -907,6 +921,10 @@ Commandline Examples:
<delete dir="test/Spring/Spring.Data.NHibernate31.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate31.Integration.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate31.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate32.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate32.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate32.Integration.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate32.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
@@ -1351,6 +1369,18 @@ Commandline Examples:
</fileset>
</copy>
</if>
<mkdir dir="${current.package.dir}/lib/NHibernate32"/>
<if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
<copy todir="${current.package.dir}/lib/NHibernate32" verbose="${copy-verbose}">
<fileset basedir="lib/NHibernate32">
<include name="**/*.dll"/>
<include name="**/*.xml"/>
<include name="**/*.license.txt"/>
<exclude name="mono/**"/>
</fileset>
</copy>
</if>
<if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
<copy todir="${current.package.dir}/lib" verbose="${copy-verbose}">
@@ -1510,6 +1540,10 @@ Commandline Examples:
<include name="*/*/Spring.Data.NHibernate31.xml"/>
<include name="*/*/Spring.Data.NHibernate31.pdb"/>
<include name="*/*/Spring.Data.NHibernate32.dll"/>
<include name="*/*/Spring.Data.NHibernate32.xml"/>
<include name="*/*/Spring.Data.NHibernate32.pdb"/>
<include name="*/*/Spring.Web.dll"/>
<include name="*/*/Spring.Web.xml"/>
<include name="*/*/Spring.Web.pdb"/>
@@ -1602,7 +1636,11 @@ Commandline Examples:
<include name="*/Spring.Data.NHibernate31.dll"/>
<include name="*/Spring.Data.NHibernate31.xml"/>
<include name="*/Spring.Data.NHibernate31.pdb"/>
<include name="*/Spring.Data.NHibernate31.pdb"/>
<include name="*/Spring.Data.NHibernate32.dll"/>
<include name="*/Spring.Data.NHibernate32.xml"/>
<include name="*/Spring.Data.NHibernate32.pdb"/>
</fileset>
</copy>
@@ -1815,8 +1853,9 @@ Commandline Examples:
<include name="src/Spring/Spring.Data.NHibernate12/**"/>
<include name="src/Spring/Spring.Data.NHibernate20/**"/>
<include name="src/Spring/Spring.Data.NHibernate21/**"/>
<include name="src/Spring/Spring.Data.NHibernate30/**"/>
<include name="src/Spring/Spring.Data.NHibernate31/**"/>
<include name="src/Spring/Spring.Data.NHibernate30/**"/>
<include name="src/Spring/Spring.Data.NHibernate31/**"/>
<include name="src/Spring/Spring.Data.NHibernate32/**"/>
<include name="src/Spring/Spring.Messaging/**"/>
<include name="src/Spring/Spring.Messaging.Nms/**"/>
<include name="src/Spring/Spring.Messaging.Ems/**"/>
@@ -1844,6 +1883,8 @@ Commandline Examples:
<include name="test/Spring/Spring.Data.NHibernate30.Integration.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate31.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate31.Integration.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate32.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate32.Integration.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>
@@ -1934,7 +1975,11 @@ Commandline Examples:
<target name="package-nuget" depends="update-nuspec-metadata">
<property name="nuget.package.dir" value="${spring.basedir}\nuget-packages" />
<call target="clean-nuget-package-dir" />
<call target="check-package-version" />
<foreach item="File" property="filename">
<in>
<items basedir="${spring.basedir}/src/spring">
@@ -1960,14 +2005,16 @@ Commandline Examples:
<target name="update-nuspec-metadata">
<property name="nuget.package.dir" value="${spring.basedir}\nuget-packages" />
<call target="clean-nuget-package-dir" />
<call target="check-package-version" />
<foreach item="File" property="filename">
<in>
<items basedir="${spring.basedir}/src/spring">
<include name="**/*.nuspec" />
<!--
NOTE: must exclude Spring.Core.nuspec b/c it has no Spring.* deps and so this XPATH expr. won't find a match in that case
and so would fail this XMLPOKE operation otherwise
-->
<exclude name="**/Spring.Core.nuspec" />
</items>
</in>
<do>
@@ -1986,7 +2033,7 @@ Commandline Examples:
NOTE: must set fail-on-errror to false b/c Spring.Core (ex.) has no Spring.* deps and so this XPATH expr. won't find a match in that case
and so would fail this XMLPOKE operation otherwise
-->
<xmlpoke file="${filename}" xpath="/n:package/n:metadata/n:dependencies/n:dependency[starts-with(@id, 'Spring.')]/@version" value="${package.version}" failonerror="false" >
<xmlpoke file="${filename}" xpath="/n:package/n:metadata/n:dependencies/n:dependency[starts-with(@id, 'Spring.')]/@version" value="${package.version}"> <!-- failonerror="false" > -->
<namespaces>
<namespace prefix="n" uri="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" />
</namespaces>