From b16ec89b35529d080563334995b63c9a62008cb9 Mon Sep 17 00:00:00 2001
From: sbohlen <sbohlen@gmail.com>
Date: Thu, 9 Dec 2010 16:27:51 +0000
Subject: [PATCH] mods to packaging script to copy 3.5-specific binaries

---
 Spring.build                  | 33 +++++++++++++++++++++++++++++++--
 copy-files-to-package-dir.cmd | 23 +++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 copy-files-to-package-dir.cmd

diff --git a/Spring.build b/Spring.build
index 9f2977bb..847e1747 100644
--- a/Spring.build
+++ b/Spring.build
@@ -99,6 +99,10 @@ Commandline Examples:
 
 -->
 
+<!--
+  global DIAGNOSTICS setting, applied to EVERY instance of <copy> task via verbose="${copy-verbose}" attribute
+  so as to be toggled in ONE place and affect ALL copy operations; leave FALSE except for debugging/troubleshooting the build
+-->
   <property name="copy-verbose" value="true" />
 
   <!-- global project settings -->
@@ -1504,7 +1508,7 @@ Commandline Examples:
         </fileset>
       </copy>
 
-      <if test="${net-3.0.installed}">
+<!--      <if test="${net-3.0.installed}"> -->
         <mkdir dir="${current.package.dir}/bin/net/3.0"/>
         <copy todir="${current.package.dir}/bin/net/3.0" verbose="${copy-verbose}">
           <fileset basedir="./build/net/3.0">
@@ -1513,7 +1517,32 @@ Commandline Examples:
             <include name="*/Spring.Services.pdb"/>
           </fileset>
         </copy>
-      </if>
+<!--      </if> -->
+	  
+	  
+        <mkdir dir="${current.package.dir}/bin/net/3.5"/>
+        <copy todir="${current.package.dir}/bin/net/3.5" verbose="${copy-verbose}">
+          <fileset basedir="./build/net/3.5">
+            
+			<include name="*/Spring.Services.dll"/>
+            <include name="*/Spring.Services.xml"/>
+            <include name="*/Spring.Services.pdb"/>
+			
+			<include name="*/Spring.Scheduling.Quartz.dll"/>
+            <include name="*/Spring.Scheduling.Quartz.xml"/>
+            <include name="*/Spring.Scheduling.Quartz.pdb"/>
+			
+			<include name="*/Spring.Web.Mvc.dll"/>
+            <include name="*/Spring.Web.Mvc.xml"/>
+            <include name="*/Spring.Web.Mvc.pdb"/>
+			
+			<include name="*/Spring.Web.Extensions.dll"/>
+            <include name="*/Spring.Web.Extensions.xml"/>
+            <include name="*/Spring.Web.Extensions.pdb"/>
+			
+          </fileset>
+        </copy>
+      
    </if>
 
     <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
diff --git a/copy-files-to-package-dir.cmd b/copy-files-to-package-dir.cmd
new file mode 100644
index 00000000..560b01e0
--- /dev/null
+++ b/copy-files-to-package-dir.cmd
@@ -0,0 +1,23 @@
+@echo off
+@echo .
+@echo ..
+@echo ...
+@echo Running full Build Script, capturing output to buildlog.txt file...
+@echo Start Time: %time%
+build-support\tools\nant\bin\nant package-release-files -f:spring.build -D:project.build.sign=true -D:mstest.exe="c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\mstest.exe" -D:package.version=1.3.1 -D:vs-net.mstest.bin.dir="c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" > buildlog.txt
+@echo .
+@echo ..
+@echo ...
+@echo Launching text file viewer to display buildlog.txt contents...
+start "ignored but required placeholder window title argument" buildlog.txt
+@echo .
+@echo ..
+@echo ...
+@echo ************************
+@echo Build Complete!
+@echo ************************
+@echo End Time: %time%
+@echo    
+
+
+