Added support for NH 3.0 (built from trunk), added net-3.5 target to build file, added NH 3.0 targets to build, set NH 2.1 to be part of standard build
This commit is contained in:
93
Spring.build
93
Spring.build
@@ -300,6 +300,25 @@ Build properties that may be set:
|
||||
</target>
|
||||
|
||||
|
||||
<target name="compile-build-3.5" description="Builds for .NET 3.5 if available">
|
||||
|
||||
<if test="${net-3.5.installed}">
|
||||
<call target="compile-net-3.5"/>
|
||||
</if>
|
||||
|
||||
<if test="${not net-3.5.installed}">
|
||||
<if test="${property::exists('project.build.package') and project.build.package}">
|
||||
.NET 3.5 Build Skipped for Package
|
||||
<fail message="The .NET Framework 3.5 is not available."/>
|
||||
<echo message="The .NET Framework 3.5 is not available. Build skipped during package."/>
|
||||
</if>
|
||||
<if test="${not(property::exists('project.build.package') and project.build.package)}">
|
||||
<echo message="The .NET Framework 3.5 is not available. Build skipped."/>
|
||||
</if>
|
||||
</if>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Targets for other .NET frameworks -->
|
||||
|
||||
<target name="compile-build-netcf-1.0" description="Builds for .NET 1.0 Compact Framework if available">
|
||||
@@ -342,6 +361,7 @@ Build properties that may be set:
|
||||
<property name="nh12.lib.dir" value="${spring.basedir}/lib/NHibernate12/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<property name="nh20.lib.dir" value="${spring.basedir}/lib/NHibernate20/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<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())}"/>
|
||||
<call target="copylibs"/>
|
||||
|
||||
<!-- build assemblies -->
|
||||
@@ -354,6 +374,7 @@ Build properties that may be set:
|
||||
<nant buildfile="src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
|
||||
<nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
|
||||
<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 == 'mono-2.0') and not net-3.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 == 'mono-2.0') and not net-3.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 and not net-3.0}"/>
|
||||
<nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-mstest and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
|
||||
@@ -377,6 +398,10 @@ Build properties that may be set:
|
||||
if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
|
||||
<nant buildfile="test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build" target="test"
|
||||
if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
|
||||
<nant buildfile="test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build" target="test"
|
||||
if="${build-data and nant.settings.currentframework == 'net-3.5' and not net-3.0}"/>
|
||||
<nant buildfile="test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build" target="test"
|
||||
if="${build-data and nant.settings.currentframework == 'net-3.5' and not net-3.0}"/>
|
||||
<nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and not net-3.0}"/>
|
||||
<nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${not net-3.0}"/>
|
||||
@@ -444,6 +469,18 @@ Build properties that may be set:
|
||||
<call target="compile-test" />
|
||||
</target>
|
||||
|
||||
<target name="compile-net-3.5" description="Builds .NET Framework 3.5 version"
|
||||
depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
|
||||
<call target="copykeys" if="${project.build.sign}"/>
|
||||
<call target="common.generate-assemblyinfo"/>
|
||||
<property name="build-nms" value="false" />
|
||||
<property name="build-quartz" value="false" />
|
||||
<property name="build-msmq" value="false" />
|
||||
<property name="build-msmq-tests" value="false" />
|
||||
<property name="build-velocity" value="false" />
|
||||
<call target="compile-test" />
|
||||
</target>
|
||||
|
||||
<target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
|
||||
depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
|
||||
<call target="copykeys" if="${project.build.sign}"/>
|
||||
@@ -574,6 +611,24 @@ Build properties that may be set:
|
||||
</if>
|
||||
</target>
|
||||
|
||||
<target name="build-3.5">
|
||||
<call target="set-build-namespaces-release"/>
|
||||
<echo message="------------------------"/>
|
||||
<echo message="Building .NET 3.5 DEBUG "/>
|
||||
<echo message="------------------------"/>
|
||||
<call target="set-debug-build-configuration"/>
|
||||
<call target="compile-build-3.5"/>
|
||||
|
||||
|
||||
<if test="${property::exists('project.build.package') and project.build.package}">
|
||||
<echo message="--------------------------"/>
|
||||
<echo message="Building .NET 3.5 RELEASE "/>
|
||||
<echo message="--------------------------"/>
|
||||
<call target="set-release-build-configuration"/>
|
||||
<call target="compile-build-3.5"/>
|
||||
</if>
|
||||
</target>
|
||||
|
||||
<target name="build-mono-2.0">
|
||||
|
||||
<if test="${property::exists('project.build.package') and project.build.package}">
|
||||
@@ -618,9 +673,11 @@ Build properties that may be set:
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate12/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate20/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate20/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate21/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate21/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Services/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate21/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate21/bin" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate30/obj" failonerror="false"/>
|
||||
<delete dir="src/Spring/Spring.Data.NHibernate30/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"/>
|
||||
<delete dir="src/Spring/Spring.Messaging.Nms/bin" failonerror="false"/>
|
||||
@@ -653,11 +710,15 @@ Build properties that may be set:
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate20.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate20.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate20.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate21.Integration.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate30.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate30.Tests/bin" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate30.Integration.Tests/obj" failonerror="false"/>
|
||||
<delete dir="test/Spring/Spring.Data.NHibernate30.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"/>
|
||||
<delete dir="test/Spring/Spring.Messaging.Nms.Tests/bin" failonerror="false"/>
|
||||
@@ -1003,6 +1064,10 @@ Build properties that may be set:
|
||||
<include name="**/Spring.Data.NHibernate20.xml"/>
|
||||
<include name="**/Spring.Data.NHibernate20.pdb"/>
|
||||
|
||||
<include name="**/Spring.Data.NHibernate21.dll"/>
|
||||
<include name="**/Spring.Data.NHibernate21.xml"/>
|
||||
<include name="**/Spring.Data.NHibernate21.pdb"/>
|
||||
|
||||
<include name="**/Spring.Web.dll"/>
|
||||
<include name="**/Spring.Web.xml"/>
|
||||
<include name="**/Spring.Web.pdb"/>
|
||||
@@ -1162,6 +1227,15 @@ Build properties that may be set:
|
||||
</copy>
|
||||
</if>
|
||||
|
||||
<mkdir dir="${current.package.dir}/lib/NHibernate21"/>
|
||||
<if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
|
||||
<copy todir="${current.package.dir}/lib/NHibernate21">
|
||||
<fileset basedir="lib/NHibernate21">
|
||||
<include name="**/*.dll"/>
|
||||
<include name="**/*.license.txt"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</if>
|
||||
|
||||
<if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
|
||||
<copy todir="${current.package.dir}/lib">
|
||||
@@ -1392,6 +1466,7 @@ Build properties that may be set:
|
||||
<include name="src/Spring/Spring.Data.NHibernate/**"/>
|
||||
<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.Messaging/**"/>
|
||||
<include name="src/Spring/Spring.Messaging.Nms/**"/>
|
||||
<include name="src/Spring/Spring.Scheduling.Quartz/**"/>
|
||||
@@ -1409,6 +1484,8 @@ Build properties that may be set:
|
||||
<include name="test/Spring/Spring.Data.NHibernate.Integration.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Data.NHibernate20.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Data.NHibernate20.Integration.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Data.NHibernate21.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Data.NHibernate21.Integration.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Messaging.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
|
||||
<include name="test/Spring/Spring.Scheduling.Quartz.Tests/**"/>
|
||||
|
||||
Reference in New Issue
Block a user