From 6edcf555b6f2f303c77f8c26ae1565a980010157 Mon Sep 17 00:00:00 2001
From: eeichinger <eeichinger@gmail.com>
Date: Mon, 3 Aug 2009 21:49:21 +0000
Subject: [PATCH] fixed 3.0 assembly deployment

---
 Spring.build | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/Spring.build b/Spring.build
index 89023b81..085baa7b 100644
--- a/Spring.build
+++ b/Spring.build
@@ -1082,16 +1082,6 @@ Commandline Examples:
       </copy>
     </if>
 
-    <mkdir dir="${current.package.dir}/lib/NHibernate10"/>
-    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/NHibernate10">
-        <fileset basedir="lib/NHibernate10">
-          <include name="**/*.dll"/>
-          <include name="**/*.license.txt"/>
-        </fileset>
-      </copy>
-    </if>
-
     <mkdir dir="${current.package.dir}/lib/NHibernate12"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
       <copy todir="${current.package.dir}/lib/NHibernate12">
@@ -1293,23 +1283,24 @@ Commandline Examples:
           <include name="*/*/Spring.Template.Velocity.xml"/>
           <include name="*/*/Spring.Template.Velocity.pdb"/>
 
-          <exclude name="/3.0/**"/>
-          <exclude name="/3.5/**"/>
+          <exclude name="3.0/**"/>
+          <exclude name="3.5/**"/>
 
         </fileset>
       </copy>
+
+      <if test="${net-3.0.installed}">
+        <mkdir dir="${current.package.dir}/bin/net/3.0"/>
+        <copy todir="${current.package.dir}/bin/net/3.0">
+          <fileset basedir="./build/net/3.0">
+            <include name="*/Spring.Services.dll"/>
+            <include name="*/Spring.Services.xml"/>
+            <include name="*/Spring.Services.pdb"/>
+          </fileset>
+        </copy>
+      </if>
    </if>
 
-    <if test="${net-3.0.installed}">
-      <copy todir="${current.package.dir}/bin/net/3.0">
-        <fileset basedir="./build/net/3.0">
-          <include name="Spring.Services.dll"/>
-          <include name="Spring.Services.xml"/>
-          <include name="Spring.Services.pdb"/>
-        </fileset>
-      </copy>
-    </if>
-
     <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
       <copy todir="${current.package.dir}/bin/net">
         <fileset basedir="./build/net">