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

Fixing lib issue in compilation and removing old remnants of net-3.0 build checks

Browse Source
This commit is contained in:
Marko Lahma
2012-02-17 17:02:15 +02:00
parent 88e05db3de
commit 32c8fade4d
4 changed files with 10 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spring.build
View File

@@ -454,8 +454,8 @@ Commandline Examples:
<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${nant.settings.currentframework == 'net-4.0'}"/>
<nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit}"/>
<nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' ) and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0') and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' )}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0')}"/>
<nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
<nant buildfile="test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build" target="test" if="${build-nms}"/>
<nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz}"/>
@@ -498,6 +498,8 @@ Commandline Examples:
<property name="build-msmq-tests" value="true" overwrite="true" />
<property name="build-velocity" value="true" overwrite="true" />
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<call target="copylibs" />
<call target="compile-test" />
</target>
@@ -524,6 +526,8 @@ Commandline Examples:
<property name="build-msmq-tests" value="true" overwrite="true" />
<property name="build-velocity" value="true" overwrite="true" />
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<call target="copylibs" />
<call target="compile-test" />
</target>
@@ -1237,12 +1241,6 @@ Commandline Examples:
<copy todir="${current.package.dir}/doc/schema"
file="build-support/install-schema.build"/>
<copy todir="${current.package.dir}/bin/net/3.0/debug"
file="build-support/readme-net-3.0.txt"/>
<copy todir="${current.package.dir}/bin/net/3.0/release"
file="build-support/readme-net-3.0.txt"/>
<mkdir dir="${current.package.dir}/bin/net/3.5/debug"/>
<mkdir dir="${current.package.dir}/bin/net/3.5/release"/>

25
Spring.include
View File

@@ -17,31 +17,6 @@
value="${spring.basedir}/bin/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
dynamic="true"/>
<!-- detect if .net 3.0 is installed -->
<property name="net-3.0" value="false"/>
<property name="registry.net-3.0.installed" value="0" overwrite="false"/>
<readregistry property="registry.net-3.0.installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Install"
hive="LocalMachine"
failonerror="false" />
<readregistry property="registry.dotnet.v3.0.Installed"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup\InstallSuccess"
hive="LocalMachine"
unless="${property::exists('registry.net-3.0.installed')}"
failonerror="false" />
<property name="net-3.0.installed" value="${registry.net-3.0.installed == '1'}" />
<if test="${net-3.0.installed}">
<readregistry property="net-3.0.ReferenceInstallPath"
key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0\Setup\Windows Communication Foundation\ReferenceInstallPath"
hive="LocalMachine"
if="${net-3.0.installed}" />
</if>
<!-- detect if .net 3.5 is installed -->
<property name="net-3.5" value="false"/>
<property name="registry.net-3.5.installed" value="0" overwrite="false"/>

50
src/Spring/Spring.Services/Spring.Services.build
View File

@@ -7,48 +7,8 @@
* current.build.defines.csc - framework-specific build defines for C# compiler
-->
<target name="build">
<if test="${net-3.0.installed and net-3.0 and not net-4.0}">
<property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${current.build.config}"/>
<echo message="-----------------"/>
<echo message="Copying Spring NET 2.0 output to 3.0 bin directory except for Spring.Services, which will be compiled."/>
<echo message="Copying from ${bin.dir.to.use}"/>
<echo message=" to ${current.bin.dir}"/>
<echo message="-----------------"/>
<copy todir="${current.bin.dir}" overwrite="true" failonerror="true" verbose="${copy-verbose}">
<fileset basedir="${bin.dir.to.use}">
<include name="Spring.**.dll"/>
<include name="Spring.**.pdb"/>
<include name="Spring.**.xml"/>
<include name="Common.Logging.*"/>
<exclude name="System.Web.Extensions.dll" if="${net-3.5}"/>
<exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>
<exclude name="Quartz.dll" if="${net-3.5}"/>
<exclude name="Quartz.dll" if="${net-4.0}"/>
<exclude name="Spring.Services.dll"/>
<exclude name="Spring.Services.pdb"/>
<exclude name="Spring.Services.xml"/>
</fileset>
</copy>
</if>
<if test="${net-3.0.installed and net-3.0 and not net-4.0}">
<copy todir="${current.bin.dir}" overwrite="true" failonerror="true" verbose="${copy-verbose}">
<fileset basedir="${bin.dir.to.use}">
<include name="Spring.**.dll"/>
<include name="Spring.**.pdb"/>
<include name="Spring.**.xml"/>
<include name="Common.Logging.*"/>
<exclude name="System.Web.Extensions.dll" if="${net-3.5}"/>
<exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>
<exclude name="Quartz.dll" if="${net-3.5}"/>
<exclude name="Quartz.dll" if="${net-4.0}"/>
<exclude name="Spring.Services.dll"/>
<exclude name="Spring.Services.pdb"/>
<exclude name="Spring.Services.xml"/>
</fileset>
</copy>
</if>
<!-- build Spring.Services -->
<!-- build Spring.Services -->
<csc target="library" define="${current.build.defines.csc}"
warnaserror="true"
optimize="${build.optimize}"
@@ -68,7 +28,7 @@
<include name="Remoting/Config/spring-remoting-1.1.xsd" />
</resources>
<resources basedir="." prefix="Spring.ServiceModel.Config">
<include if="${net-3.0.installed and net-3.0}" name="ServiceModel/Config/spring-wcf-1.3.xsd" />
<include name="ServiceModel/Config/spring-wcf-1.3.xsd" />
</resources>
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.keys" />
@@ -80,9 +40,7 @@
<include name="Spring.Aop.dll" />
<include name="Spring.Web.dll" />
<include name="System.Web.Services.dll" />
<include if="${net-3.0.installed and net-3.0 and not net-4.0}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />
<include if="${nant.settings.currentframework == 'net-4.0'}" name="System.ServiceModel.Activation.dll" />
<include name="System.ServiceModel.Activation.dll" />
</references>
</csc>
</target>

22
test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
View File

@@ -10,28 +10,6 @@
* current.build.defines.csc - framework-specific build defines for C# compiler
-->
<target name="build">
<if test="${net-3.0.installed and net-3.0}">
<property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${project.build.config}"/>
<copy todir="${current.bin.dir}" verbose="${copy-verbose}">
<fileset basedir="${bin.dir.to.use}">
<include name="*.dll"/>
<include name="*.pdb"/>
<include name="*.xml"/>
<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.Services.Protocols.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Web.Services.Description.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.ServiceModel.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
<exclude name="System.Web.Extensions.dll" if="${net-3.5}"/>
<exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>
<exclude name="Quartz.dll" if="${net-3.5}"/>
<exclude name="Quartz.dll" if="${net-4.0}"/>
<exclude name="Spring.Services.dll"/>
<exclude name="Spring.Services.pdb"/>
<exclude name="Spring.Services.xml"/>
</fileset>
</copy>
</if>
<!-- build Spring.Services.Tests -->
<csc target="library" define="${current.build.defines.csc}"