SPRNET-1396

2010-12-07 20:30:04 +00:00
parent 76445f9665
commit 8a23270b5d
7 changed files with 84 additions and 103 deletions
--- a/Build.cmd
+++ b/Build.cmd
@@ -4,7 +4,7 @@
@echo ...
@echo Running full Build Script, capturing output to buildlog.txt file...
@echo Start Time: %time%
-build-support\tools\nant\bin\nant %1 %2 %3 %4 %5 %6 %7 %8 %9 >> buildlog.txt
+build-support\tools\nant\bin\nant %1 %2 %3 %4 %5 %6 %7 %8 %9 > buildlog.txt
@echo .
@echo ..
@echo ...
--- a/Spring.build
+++ b/Spring.build
@@ -463,6 +463,7 @@ Commandline Examples:
    <nant buildfile="src/Spring/Spring.Aop/Spring.Aop.build" target="build" if="${build-aop}"/>
    <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web}"/>
    <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0')}"/>
+	<nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
    <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
    <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')}"/>
    <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')}"/>
@@ -502,6 +503,7 @@ Commandline Examples:
                 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'}"/>
    <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 and nant.settings.currentframework == 'net-2.0'}"/>
    <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
@@ -537,6 +539,7 @@ Commandline Examples:
    <property name="build-msmq-tests" value="false" overwrite="true" />
    <property name="build-velocity" value="false" overwrite="true" />
    <property name="build-testing-microsoft" value="false" overwrite="true" />
+	<property name="build-quartz" value="false" overwrite="true" />
    <call target="compile-test" />
  </target>

@@ -574,7 +577,7 @@ Commandline Examples:
 	<call target="common.generate-assemblyinfo"/>
    <property name="build-ems" value="false" overwrite="true" />
    <property name="build-nms" value="false" overwrite="true" />
-    <property name="build-quartz" value="false" overwrite="true" />
+    <property name="build-quartz" value="true" overwrite="true" />
    <property name="build-msmq" value="false" overwrite="true" />
    <property name="build-msmq-tests" value="false" overwrite="true" />
    <property name="build-velocity" value="false" overwrite="true" />
@@ -585,7 +588,9 @@ Commandline Examples:
    <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
    <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
 	<nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
-	<nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz}"/>
+	<nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="test" if="${build-quartz}"/>
+	<nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build"/>
+	<nant buildfile="test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build" target="test"/>
  </target>

  <target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
--- a/common-project.include
+++ b/common-project.include
@@ -318,4 +318,8 @@ ${tool.dir}       : dir for tools

    </target>

+	<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
+  <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
+	
+	
 </project>
--- a/src/Spring/CommonAssemblyInfo.cs
+++ b/src/Spring/CommonAssemblyInfo.cs
@@ -30,25 +30,37 @@ using System.Reflection;
 //
 //
 // This is to support side-by-side deployment of .NET 1.1 and .NET 2.0 versions of the assembly.
-#if !NET_2_0
-[assembly: AssemblyVersion("1.3.1.11001")]
-#endif

-#if NET_2_0
-[assembly: AssemblyVersion("1.3.1.20001")]
-#endif
-
-#if NET_3_0
-[assembly: AssemblyVersion("1.3.1.30001")]
-#endif
-
-#if NET_3_5
-[assembly: AssemblyVersion("1.3.1.35001")]
-#endif
+//note that this #if #elif #endif contstruct requires NET_#_# values be checked in DESCENDING order to work properly
+// (e.g., add any new ones at the TOP of this construct!)

 #if NET_4_0
 [assembly: AssemblyVersion("1.3.1.40001")]
+#elif NET_3_5
+[assembly: AssemblyVersion("1.3.1.35001")]
+#elif NET_3_0
+[assembly: AssemblyVersion("1.3.1.30001")]
+#elif NET_2_0
+[assembly: AssemblyVersion("1.3.1.20001")]
+#elif NET_1_1
+[assembly: AssemblyVersion("1.3.1.11001")]
+#elif NET_1_0
+[assembly: AssemblyVersion("1.3.1.10001")]
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
 // Microsoft .NET Framework documentation for more information on assembly signing.
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
+++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
@@ -31,7 +31,9 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e" />
+    <Reference Include="Common.Logging">
+      <HintPath>..\..\..\lib\Net\3.5\Common.Logging.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Web" />
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
+++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
@@ -1,43 +1,35 @@
 <?xml version="1.0" ?>
-<project name="Spring.Web" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<project name="Spring.Web.Mvc" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+
+<include buildfile="${spring.basedir}/common-project.include" />
+
 <!--
    Required properties:
      * current.bin.dir           - (path) root level to build to
      * current.build.debug       - (true|false) debug build?
      * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
 	<target name="build">
 		<!-- build Spring.Web.Mvc -->
-		<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}" 
-		     output="${current.bin.dir}/${project::get-name()}.dll" 
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-		     >
-			<arg line="${compiler.args}"/>	
-			<nowarn>
-				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
-				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references basedir="${current.bin.dir}">
-			        <include name="Common.Logging.dll"/>
-				<include name="antlr.runtime.dll" />
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Aop.dll" />
-				<include name="System.Configuration.dll" />
- 				<include name="System.Web.dll" />
-				<include name="System.Web.Mvc.dll" />
- 				<include name="System.Web.Services.dll" />
-				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
-			</references>
-		</csc>
+		<property name="solutionconfiguration" value="Debug" if="${current.build.config=='debug'}"/>
+		<property name="solutionconfiguration" value="Release" unless="${current.build.config=='debug'}" />
+		
+		<call target="RebuildSolution" />
 	</target>
+	
+	<property name="solutionfile" value="${project::get-base-directory()}\${project::get-name()}.2010.csproj" />
+	<target name="RebuildSolution" description="rebuilds a given solution file">
+		<echo message="Rebuilding Solution ${solutionfile}" />
+		<exec program="${msbuild.exe}">
+
+		  <arg value="/property:OutDir=${current.bin.dir}/"/>
+
+		  <arg value="${solutionfile}"/>
+		  <arg line="/nologo" />
+		  <arg line="/verbosity:minimal" />
+		  <arg line="/property:Configuration=${solutionconfiguration}"/>
+		</exec>
+  </target>
+	
 </project>
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
+++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.Web.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<project name="Spring.Web.Mvc.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">

    <include buildfile="${spring.basedir}/common-project.include" />
    <!--
@@ -11,61 +11,27 @@
    -->
    <target name="build">
        <!-- build Spring.Web.Mvc -->
-        <csc target="library" define="${current.build.defines.csc}" 
-	     warnaserror="true" 
-             optimize="${build.optimize}"
-	     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll" 
-	     doc="${current.bin.dir}/${project::get-name()}.xml">
-            <nowarn>
-                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-            </sources>
-            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-                <include name="**/*.resx" />
-                <include name="**/*.xsd" />
-                <include name="**/*.txt" />
-                <include name="**/*.xml" />
-                <exclude name="Data/**/*" />
-                <exclude name="obj/**/*" />
-            </resources>
-            <references basedir="${current.bin.dir}">
-                <include name="*.dll" />
-		<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-		<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-                <exclude name="${project::get-name()}.dll" />
-                <exclude name="CloverRuntime.dll" />
-                <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-            </references>
-        </csc>
-        <copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}/Data">
-                <include name="**/*.*" />
-            </fileset>
-        </copy>
-
-    </target>
+        
+		<property name="solutionconfiguration" value="Debug" if="${current.build.config=='debug'}"/>
+		<property name="solutionconfiguration" value="Release" unless="${current.build.config=='debug'}" />
+		
+		<call target="RebuildSolution" />
+	</target>

    <target name="test" depends="build">
        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
        <call target="common.run-tests" />
    </target>
-<!--
-    <target name="test" depends="build">
-        <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
-            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-        </nunit2outproc>
-    </target>
-->
+
+	<property name="solutionfile" value="${project::get-base-directory()}\${project::get-name()}.2010.csproj" />
+	<target name="RebuildSolution" description="rebuilds a given solution file">
+		<echo message="Rebuilding Solution ${solutionfile}" />
+		<exec program="${msbuild.exe}">
+		  <arg value="/property:OutDir=${current.bin.dir}/"/>
+		  <arg value="${solutionfile}"/>
+		  <arg line="/nologo" />
+		  <arg line="/verbosity:minimal" />
+		  <arg line="/property:Configuration=${solutionconfiguration}"/>
+		</exec>
+	</target>
 </project>