activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r1001885 [1/2] - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/trunk/ Apache.NMS.Stomp/trunk/ Apache.NMS.WCF/trunk/ Apache.NMS/trunk/ vendor/DotNetZlib/1.9.0/ vendor/DotNetZlib/1.9.0/net-4.0/...
Date Mon, 27 Sep 2010 19:35:02 GMT
Author: jgomes
Date: Mon Sep 27 19:35:01 2010
New Revision: 1001885

URL: http://svn.apache.org/viewvc?rev=1001885&view=rev
Log:
Add support for building .NET 4.0 assemblies.  Dependent vendor assemblies are currently only
copies of the .NET 3.5 versions.  Once actual .NET 4.0 versions are available, they can be
checked in.
Fixes [AMQNET-286]. (See https://issues.apache.org/activemq/browse/AMQNET-286)

Added:
    activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/net-4.0/
      - copied from r1001856, activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/net-3.5/
    activemq/activemq-dotnet/vendor/NUnit/2.5.5/net-4.0/
      - copied from r1001856, activemq/activemq-dotnet/vendor/NUnit/2.5.5/net-3.5/
Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1
    activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant-common.xml
    activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant.build
    activemq/activemq-dotnet/vendor/NUnit/2.5.5/nant-common.xml
    activemq/activemq-dotnet/vendor/NUnit/2.5.5/nant.build

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Mon Sep 27 19:35:01
2010
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <!-- TODO: Add net-4.0 once NAnt supports it. -->
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />
         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
         <property name="current.build.framework.sign" value="true" />
-        <property name="link.sdkdoc.version" value="SDK_v6_1" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
         <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
     </target>
@@ -469,7 +468,6 @@
                 <exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
                     <arg value="${NUnit.Projectfile}" />
                     <arg value="-labels" />
-                    <arg value="-exclude=LongRunning" />
                     <arg value="-xml=Nunit.TestOutput.xml" />
                 </exec>
             </if>

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/package.ps1 Mon Sep 27 19:35:01 2010
@@ -16,47 +16,47 @@
 $pkgname = "Apache.NMS.ActiveMQ"
 $pkgver = "1.5-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "mono-2.0", "net-2.0", "net-3.5"
+$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))
 {
-    md package
+	md package
 }
 
 if(test-path build)
 {
-    pushd build
+	pushd build
 
-    $pkgdir = "..\package"
+	$pkgdir = "..\package"
 
-    write-progress "Packaging Application files." "Scanning..."
-    $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
-    zip -9 -u -j "$zipfile" ..\LICENSE.txt
-    zip -9 -u -j "$zipfile" ..\NOTICE.txt
-    foreach($configuration in $configurations)
-    {
-        foreach($framework in $frameworks)
-        {
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
-            zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
-            if($framework -ieq "mono-2.0")
-            {
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
-            }
-            else
-            {
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
-            }
-        }
-    }
+	write-progress "Packaging Application files." "Scanning..."
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+	foreach($configuration in $configurations)
+	{
+		foreach($framework in $frameworks)
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
+			zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+			if($framework -ieq "mono-2.0")
+			{
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+			}
+			else
+			{
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+			}
+		}
+	}
 
-    popd
+	popd
 }
 
 write-progress "Packaging Source code files." "Scanning..."

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Mon Sep 27 19:35:01 2010
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <!-- TODO: Add net-4.0 once NAnt supports it. -->
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />
         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
         <property name="current.build.framework.sign" value="true" />
-        <property name="link.sdkdoc.version" value="SDK_v6_1" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
         <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
     </target>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/package.ps1 Mon Sep 27 19:35:01 2010
@@ -16,7 +16,7 @@
 $pkgname = "Apache.NMS.EMS"
 $pkgver = "1.5-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "net-2.0", "net-3.5"
+$frameworks = "net-2.0", "net-3.5", "net-4.0"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Mon Sep 27 19:35:01 2010
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <!-- TODO: Add net-4.0 once NAnt supports it. -->
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />
         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
         <property name="current.build.framework.sign" value="true" />
-        <property name="link.sdkdoc.version" value="SDK_v6_1" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
         <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
     </target>

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/package.ps1 Mon Sep 27 19:35:01 2010
@@ -16,7 +16,7 @@
 $pkgname = "Apache.NMS.MSMQ"
 $pkgver = "1.5-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "net-2.0", "net-3.5"
+$frameworks = "net-2.0", "net-3.5", "net-4.0"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml Mon Sep 27 19:35:01 2010
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <!-- TODO: Add net-4.0 once NAnt supports it. -->
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />
         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
         <property name="current.build.framework.sign" value="true" />
-        <property name="link.sdkdoc.version" value="SDK_v6_1" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
         <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
     </target>
@@ -469,7 +468,6 @@
                 <exec program="nunit-console" failonerror="true" workingdir="build/${current.build.framework}/${current.build.config}">
                     <arg value="${NUnit.Projectfile}" />
                     <arg value="-labels" />
-                    <arg value="-exclude=LongRunning" />
                     <arg value="-xml=Nunit.TestOutput.xml" />
                 </exec>
             </if>

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/package.ps1?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/package.ps1 Mon Sep 27 19:35:01 2010
@@ -16,47 +16,47 @@
 $pkgname = "Apache.NMS.Stomp"
 $pkgver = "1.5-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0"
+$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))
 {
-    md package
+	md package
 }
 
 if(test-path build)
 {
-    pushd build
+	pushd build
 
-    $pkgdir = "..\package"
+	$pkgdir = "..\package"
 
-    write-progress "Packaging Application files." "Scanning..."
-    $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
-    zip -9 -u -j "$zipfile" ..\LICENSE.txt
-    zip -9 -u -j "$zipfile" ..\NOTICE.txt
-    foreach($configuration in $configurations)
-    {
-        foreach($framework in $frameworks)
-        {
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
-            zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
-            if($framework -ieq "mono-2.0")
-            {
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
-            }
-            else
-            {
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
-            }
-        }
-    }
+	write-progress "Packaging Application files." "Scanning..."
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+	foreach($configuration in $configurations)
+	{
+		foreach($framework in $frameworks)
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
+			zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+			if($framework -ieq "mono-2.0")
+			{
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+			}
+			else
+			{
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+			}
+		}
+	}
 
-    popd
+	popd
 }
 
 write-progress "Packaging Source code files." "Scanning..."

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Mon Sep 27 19:35:01 2010
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <!-- TODO: Add net-4.0 once NAnt supports it. -->
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />
         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
         <property name="current.build.framework.sign" value="true" />
-        <property name="link.sdkdoc.version" value="SDK_v6_1" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
         <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
     </target>

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/package.ps1 Mon Sep 27 19:35:01 2010
@@ -16,7 +16,7 @@
 $pkgname = "Apache.NMS.WCF"
 $pkgver = "1.5-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "net-3.5"
+$frameworks = "net-3.5", "net-4.0"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Mon Sep 27 19:35:01 2010
@@ -44,8 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <!-- TODO: Add net-4.0 once NAnt supports it. -->
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -228,7 +227,7 @@
         <property name="current.build.framework.name" value=".NET 4.0" />
         <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
         <property name="current.build.framework.sign" value="true" />
-        <property name="link.sdkdoc.version" value="SDK_v6_1" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
         <property name="link.sdkdoc.web" value="true" />
         <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
     </target>

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Mon Sep 27 19:35:01 2010
@@ -66,7 +66,7 @@
     </target>
 
     <target name="dependency-init" description="Initializes build dependencies">
-        <if test="${current.build.framework == 'net-3.5' or current.build.framework ==
'mono-2.0'}">
+        <if test="${current.build.framework == 'net-3.5' or current.build.framework ==
'net-4.0' or current.build.framework == 'mono-2.0'}">
             <assemblyfileset failonempty="true" id="dependencies">
                 <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
                 <include name="${current.build.framework.assembly.dir}/System.dll" />
@@ -75,7 +75,7 @@
                 <include name="${current.build.framework.assembly.dir}/System.Xml.dll"
/>
             </assemblyfileset>
         </if>
-        <if test="${current.build.framework != 'net-3.5'}">
+        <if test="${current.build.framework != 'net-3.5' and current.build.framework !=
'net-4.0'}">
             <assemblyfileset failonempty="true" id="dependencies">
                 <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
                 <include name="${current.build.framework.assembly.dir}/System.dll" />

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/package.ps1 Mon Sep 27 19:35:01 2010
@@ -16,46 +16,46 @@
 $pkgname = "Apache.NMS"
 $pkgver = "1.5-SNAPSHOT"
 $configurations = "release", "debug"
-$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0", "netcf-3.5"
+$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
 
 write-progress "Creating package directory." "Initializing..."
 if(!(test-path package))
 {
-    md package
+	md package
 }
 
 if(test-path build)
 {
-    pushd build
+	pushd build
 
-    $pkgdir = "..\package"
+	$pkgdir = "..\package"
 
-    write-progress "Packaging Application files." "Scanning..."
-    $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
-    zip -9 -u -j "$zipfile" ..\LICENSE.txt
-    zip -9 -u -j "$zipfile" ..\NOTICE.txt
-    foreach($configuration in $configurations)
-    {
-        foreach($framework in $frameworks)
-        {
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
-            zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
-            if($framework -ieq "mono-2.0")
-            {
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
-            }
-            else
-            {
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
-                zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
-            }
-        }
-    }
+	write-progress "Packaging Application files." "Scanning..."
+	$zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
+	zip -9 -u -j "$zipfile" ..\LICENSE.txt
+	zip -9 -u -j "$zipfile" ..\NOTICE.txt
+	foreach($configuration in $configurations)
+	{
+		foreach($framework in $frameworks)
+		{
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+			zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+			if($framework -ieq "mono-2.0")
+			{
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+			}
+			else
+			{
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+				zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+			}
+		}
+	}
 
-    popd
+	popd
 }
 
 write-progress "Packaging Source code files." "Scanning..."

Modified: activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant-common.xml?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant-common.xml Mon Sep 27 19:35:01 2010
@@ -31,6 +31,9 @@
     <property name="lib.dir"                 value="${path::combine(basedir, 'lib')}"
dynamic="true" />
     <property name="lib.family.dir"          value="${path::combine(lib.dir, framework::get-family(framework::get-target-framework()))}"
dynamic="true" />
     <property name="lib.framework.dir"       value="${path::combine(lib.family.dir, version::to-string(framework::get-version(framework::get-target-framework())))}"
dynamic="true" />
+    <property name="package.dir"             value="${basedir}/package" />
+    <property name="src.package.name"        value="${project.name + '-' + project.version
+ if(project.release.type == 'SNAPSHOT', '-' + project.release.type, '') + '-src.zip'}" />
+    <property name="bin.package.name"        value="${project.name + '-' + project.version
+ if(project.release.type == 'SNAPSHOT', '-' + project.release.type, '') + '-bin.zip'}" />
 
     <!-- default configuration -->
     <property name="build.defines"           value="" />
@@ -41,7 +44,7 @@
     <property name="current.build.config"    value="${if(project.release.type == 'release',
'release', 'debug')}" overwrite="false" />
     <property name="current.build.framework" value="${framework::get-target-framework()}"
overwrite="false" />
     <property name="current.build.defines"   value="${build.defines}" />
-    <property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -85,7 +88,7 @@
 
         <!-- Check to see if our build setup for the target framework -->
         <if test="${not(target::exists('set-'+current.build.framework+'-framework-configuration'))}">
-            <fail message="The '${current.build.framework}' framework is not supported
by this version of the .NET Zip Library" />
+            <fail message="The '${current.build.framework}' framework is not supported
by this version of ActiveMQ .NET" />
         </if>
         <call target="set-${current.build.framework}-framework-configuration" />
 
@@ -112,7 +115,7 @@
         </if>
 
         <property name="current.build.keysign" value="${current.build.framework.sign}"
/>
-        <property name="build.bin.dir" value="${build.dir}/${nant.settings.currentframework}/${current.build.config}"
/>
+        <property name="build.bin.dir" value="${build.dir}/${current.build.framework}/${current.build.config}"
/>
         <if test="${not(build.skip)}">
             <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')}
${current.build.config} build for the ${current.build.framework.name} framework" />
             <mkdir dir="${build.bin.dir}" />
@@ -201,8 +204,9 @@
         <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v2_0" />
         <property name="link.sdkdoc.web" value="true" />
-        <if test="${framework::exists(current.build.framework)}">
-            <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
+        <!-- Use the .NET 3.5 compiler for improved language features.  Still targets
same runtime. -->
+        <if test="${framework::exists('net-3.5')}">
+            <property name="nant.settings.currentframework" value="net-3.5" />
         </if>
     </target>
 
@@ -218,11 +222,21 @@
         </if>
     </target>
 
+    <target name="set-net-4.0-framework-configuration">
+        <property name="current.build.framework" value="net-4.0" />
+        <property name="current.build.framework.name" value=".NET 4.0" />
+        <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5,NET_4_0"
dynamic="true" />
+        <property name="current.build.framework.sign" value="true" />
+        <property name="link.sdkdoc.version" value="SDK_v7_0" />
+        <property name="link.sdkdoc.web" value="true" />
+        <property name="nant.settings.currentframework" value="${current.build.framework}"
/>
+    </target>
+
     <target name="set-netcf-2.0-framework-configuration">
         <property name="current.build.framework" value="netcf-2.0" />
         <property name="current.build.framework.name" value=".NET Compact Framework 2.0"
/>
         <property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_2_0"
dynamic="true" />
-        <property name="current.build.framework.sign" value="false" />
+        <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v1_1" />
         <property name="link.sdkdoc.web" value="true" />
         <if test="${framework::exists(current.build.framework)}">
@@ -234,7 +248,7 @@
         <property name="current.build.framework" value="netcf-3.5" />
         <property name="current.build.framework.name" value=".NET Compact Framework 3.5"
/>
         <property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_3_5"
dynamic="true" />
-        <property name="current.build.framework.sign" value="false" />
+        <property name="current.build.framework.sign" value="true" />
         <property name="link.sdkdoc.version" value="SDK_v3_5" />
         <property name="link.sdkdoc.web" value="true" />
         <if test="${framework::exists(current.build.framework)}">
@@ -320,6 +334,7 @@
                 output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
             <nowarn>
                 <warning number="1591" /> <!-- do not report warnings for missing
XML comments -->
+                <warning number="3016" /> <!-- do not report warnings for array
parameters  -->
             </nowarn>
             <sources failonempty="true">
                 <include name="src/test/csharp/**.cs" />
@@ -331,6 +346,7 @@
                 output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
             <nowarn>
                 <warning number="1591" /> <!-- do not report warnings for missing
XML comments -->
+                <warning number="3016" /> <!-- do not report warnings for array
parameters  -->
             </nowarn>
             <sources failonempty="true">
                 <include name="src/test/csharp/**.cs" />
@@ -414,16 +430,15 @@
             Update the LIB folder with the latest version of the file.  If there is a newer
version
             installed in the local repository, then that version will be copied into the
LIB folder.
             -->
-            <if test="${not directory::exists(local.repo.vendor.path)}">
-                <echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-                <property name="build.skip" value="true" />
-            </if>
-
             <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact">
                 <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}"
/>
                 <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" />
                 <property name="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
                 <copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+                <if test="${not file::exists(lib.task.dest)}">
+                    <echo message="Required dependent assembly ${repo.task.artifact} from
${vendor.name} for ${current.build.framework.name} is not available. Build skipped." />
+                    <property name="build.skip" value="true" />
+                </if>
             </foreach>
         </foreach>
     </target>
@@ -473,10 +488,20 @@
         </if>
         <delete dir="build" if="${directory::exists('build')}" />
         <delete dir="obj" if="${directory::exists('obj')}" />
-        <delete dir="lib" if="${directory::exists('lib')}" />
         <delete dir="package" if="${directory::exists('package')}" />
     </target>
 
+    <target name="package" description="Bundle the source and binary distributions.">
+        <mkdir dir="${package.dir}"
+                if="${not directory::exists(package.dir)}" />
+        <zip zipfile="${package.dir}/${bin.package.name}">
+            <fileset refid="bin.package.contents"/>
+        </zip>
+        <zip zipfile="${package.dir}/${src.package.name}">
+            <fileset refid="src.package.contents"/>
+        </zip>
+    </target>
+
     <target name="doc" depends="build">
         <mkdir dir="${doc.dir}" />
         <ndoc failonerror="false">

Modified: activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant.build?rev=1001885&r1=1001884&r2=1001885&view=diff
==============================================================================
--- activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant.build (original)
+++ activemq/activemq-dotnet/vendor/DotNetZlib/1.9.0/nant.build Mon Sep 27 19:35:01 2010
@@ -28,7 +28,7 @@
 	<property name="project.short_description" value=".NET Compression Library"/>
 	<property name="project.description" value=".NET Compression Library"/>
 	<property name="compile.skip" value="true"/>
-	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0,netcf-3.5"
/>
+	<property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
/>
 
 	<!-- Repository organized as: organization/module/version/plaform/artifact, platform
might be something like 'all' or 'net-2.0/release' -->
 	<target name="vendor-init" description="Initializes Vendor library from local repository.">



Mime
View raw message