Author: jgomes
Date: Fri Apr 4 10:16:02 2008
New Revision: 644780
URL: http://svn.apache.org/viewvc?rev=644780&view=rev
Log:
Add support for .NET Framework 1.1 and 3.5.
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
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=644780&r1=644779&r2=644780&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Fri Apr 4
10:16:02 2008
@@ -109,7 +109,67 @@
<copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
</target>
-<!-- Helper targets used to enable build configurations -->
+ <target name="release-init" description="Initializes release build
properties">
+ <property name="snk.file" value="${basedir}/activemq-dotnet.snk" />
+ <if test="${not file::exists(snk.file)}">
+ <if test="${build.noskip}">
+ <fail message="Release key file not found. You can generate a key file by
running 'sn -k ${snk.file}'." />
+ </if>
+ <if test="${not(build.noskip)}">
+ <echo message="Release key file not found. You can generate a key file
by running 'sn -k ${snk.file}'." />
+ <echo message="The Release build will be skipped." />
+ <property name="build.skip.release" value="true"/>
+ </if>
+ </if>
+ <if test="${file::exists(snk.file)}">
+ <property name="build.skip.release" value="false" />
+ </if>
+ </target>
+
+ <target name="init" description="Initializes build properties">
+ <!-- enabled the release or debug configuration -->
+ <call target="set-${current.build.config}-configuration"/>
+
+ <!-- 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 ActiveMQ .NET" />
+ </if>
+ <call target="set-${current.build.framework}-framework-configuration" />
+
+ <!-- Check to see current platform supports the target framework -->
+ <if test="${framework::exists(current.build.framework)}">
+ <!-- Make sure that the activemq-dotnet.snk exists for release builds
-->
+ <if test="${current.build.config.release}">
+ <call target="release-init"/>
+ <property name="build.skip" value="${build.skip.release}" />
+ </if>
+ <if test="${not current.build.config.release}">
+ <property name="build.skip" value="false" />
+ </if>
+ </if>
+ <if test="${not framework::exists(current.build.framework)}">
+ <if test="${build.noskip}">
+ <fail message="${current.build.framework.name} is not available." />
+ </if>
+ <if test="${not(build.noskip)}">
+ <echo message="${current.build.framework.name} is not available.
Build skipped." />
+ <property name="build.skip" value="true"/>
+ </if>
+ </if>
+
+ <if test="${not(build.skip)}">
+ <property name="current.build.keysign"
value="${current.build.config=='release' and current.build.framework.sign}"/>
+ <echo message="Doing ${if(current.build.keysign,'a signed','an
unsigned')} ${current.build.config} build for the
${current.build.framework.name} framework" />
+ <property name="build.bin.dir"
value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
+ <mkdir dir="${build.bin.dir}"/>
+ <call target="dependency-init"/>
+ </if>
+ </target>
+
+ <!--
============================================================================================
-->
+ <!-- C O N F I G U R A T I O N T A R G E T S
-->
+ <!--
============================================================================================
-->
+
<target name="set-noskip-configuration" description="Disable skiping builds">
<property name="project.noskip" value="true" />
</target>
@@ -159,7 +219,19 @@
<property name="current.build.framework.name" value=".NET 2.0"/>
<property name="current.build.defines" value="${build.defines}NET,NET_2_0"
dynamic="true" />
<property name="current.build.framework.sign" value="true"/>
- <property name="link.sdkdoc.version" value="SDK_v1_1" />
+ <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}" />
+ </if>
+ </target>
+
+ <target name="set-net-3.5-framework-configuration">
+ <property name="current.build.framework" value="net-3.5" />
+ <property name="current.build.framework.name" value=".NET 3.5"/>
+ <property name="current.build.defines" value="${build.defines}NET,NET_3_5"
dynamic="true" />
+ <property name="current.build.framework.sign" value="true"/>
+ <property name="link.sdkdoc.version" value="SDK_v6_0a" />
<property name="link.sdkdoc.web" value="true" />
<if test="${framework::exists(current.build.framework)}">
<property name="nant.settings.currentframework"
value="${current.build.framework}" />
@@ -214,75 +286,6 @@
</if>
</target>
- <target name="set-sscli-1.0-framework-configuration">
- <property name="current.build.framework" value="sscli-1.0" />
- <property name="current.build.framework.name" value="sscli 1.0"/>
- <property name="current.build.defines"
value="${build.defines}SSCLI,SSCLI_1_0" dynamic="true" />
- <property name="current.build.framework.sign" value="false" />
- <property name="link.sdkdoc.version" value="SDK_v1_0" />
- <property name="link.sdkdoc.web" value="true" />
- <if test="${framework::exists(current.build.framework)}">
- <property name="nant.settings.currentframework"
value="${current.build.framework}" />
- </if>
- </target>
-
- <target name="release-init" description="Initializes release build
properties">
- <property name="snk.file" value="${basedir}/activemq-dotnet.snk" />
- <if test="${not file::exists(snk.file)}">
- <if test="${build.noskip}">
- <fail message="Release key file not found. You can generate a key file by
running 'sn -k ${snk.file}'." />
- </if>
- <if test="${not(build.noskip)}">
- <echo message="Release key file not found. You can generate a key file
by running 'sn -k ${snk.file}'." />
- <echo message="The Release build will be skipped." />
- <property name="build.skip.release" value="true"/>
- </if>
- </if>
- <if test="${file::exists(snk.file)}">
- <property name="build.skip.release" value="false" />
- </if>
- </target>
-
- <target name="init" description="Initializes build properties">
- <!-- enabled the release or debug configuration -->
- <call target="set-${current.build.config}-configuration"/>
-
- <!-- 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 ActiveMQ .NET" />
- </if>
- <call target="set-${current.build.framework}-framework-configuration" />
-
- <!-- Check to see current platform supports the target framework -->
- <if test="${framework::exists(current.build.framework)}">
- <!-- Make sure that the activemq-dotnet.snk exists for release builds
-->
- <if test="${current.build.config.release}">
- <call target="release-init"/>
- <property name="build.skip" value="${build.skip.release}" />
- </if>
- <if test="${not current.build.config.release}">
- <property name="build.skip" value="false" />
- </if>
- </if>
- <if test="${not framework::exists(current.build.framework)}">
- <if test="${build.noskip}">
- <fail message="${current.build.framework.name} is not available." />
- </if>
- <if test="${not(build.noskip)}">
- <echo message="${current.build.framework.name} is not available. Build
skipped." />
- <property name="build.skip" value="true"/>
- </if>
- </if>
-
- <if test="${not(build.skip)}">
- <property name="current.build.keysign"
value="${current.build.config=='release' and current.build.framework.sign}"/>
- <echo message="Doing ${if(current.build.keysign,'a signed','an
unsigned')} ${current.build.config} build for the
${current.build.framework.name} framework" />
- <property name="build.bin.dir"
value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
- <mkdir dir="${build.bin.dir}"/>
- <call target="dependency-init"/>
- </if>
- </target>
-
<!--
============================================================================================
-->
<!-- C O M P I L E T A R G E T S
-->
<!--
============================================================================================
-->
@@ -290,7 +293,9 @@
<echo message="Compiling all build configurations for all runtime
configurations." />
<call target="set-debug-configuration" />
<call target="set-net-1.0-framework-configuration" /><call
target="conditional-compile" />
+ <call target="set-net-1.1-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-compile" />
+ <call target="set-net-3.5-framework-configuration" /><call
target="conditional-compile" />
<call target="set-mono-1.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-compile" />
@@ -300,7 +305,9 @@
<if test="${not build.skip.release}">
<call target="set-release-configuration" />
<call target="set-net-1.0-framework-configuration" /><call
target="conditional-compile" />
+ <call target="set-net-1.1-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-compile" />
+ <call target="set-net-3.5-framework-configuration" /><call
target="conditional-compile" />
<call target="set-mono-1.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-compile" />
@@ -439,7 +446,9 @@
<echo message="Installing all build configurations for all runtime
configurations." />
<call target="set-debug-configuration" />
<call target="set-net-1.0-framework-configuration" /><call
target="conditional-install" />
+ <call target="set-net-1.1-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-install" />
+ <call target="set-net-3.5-framework-configuration" /><call
target="conditional-install" />
<call target="set-mono-1.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-install" />
@@ -449,7 +458,9 @@
<if test="${not build.skip.release}">
<call target="set-release-configuration" />
<call target="set-net-1.0-framework-configuration" /><call
target="conditional-install" />
+ <call target="set-net-1.1-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-install" />
+ <call target="set-net-3.5-framework-configuration" /><call
target="conditional-install" />
<call target="set-mono-1.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-install" />
@@ -476,7 +487,6 @@
<call target="repo-install"/>
</do>
</foreach>
-
</target>
<!--
============================================================================================
-->
@@ -484,12 +494,13 @@
<!--
============================================================================================
-->
<target name="deploy-all" depends="release-init" description="Deploy all
build configurations for all runtime configurations">
-
<echo message="Deploying all build configurations for all runtime
configurations." />
<call target="set-debug-configuration" />
<call target="set-net-1.0-framework-configuration" /><call
target="conditional-deploy" />
+ <call target="set-net-1.1-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-deploy" />
+ <call target="set-net-3.5-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-1.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-deploy" />
@@ -499,7 +510,9 @@
<if test="${not build.skip.release}">
<call target="set-release-configuration" />
<call target="set-net-1.0-framework-configuration" /><call
target="conditional-deploy" />
+ <call target="set-net-1.1-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-deploy" />
+ <call target="set-net-3.5-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-1.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-deploy" />
@@ -583,4 +596,4 @@
</ndoc>
</target>
-</project>
\ No newline at end of file
+</project>
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/CommonAssemblyInfo.cs?rev=644780&r1=644779&r2=644780&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
Fri Apr 4 10:16:02 2008
@@ -1,28 +1,28 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.1378
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyTitleAttribute("Apache NMS for EMS Class Library")]
-[assembly: AssemblyDescriptionAttribute("Apache NMS for EMS Class Library
(.Net Messaging Library Implementation): An impl" +
- "ementation of the NMS API for EMS")]
-[assembly: AssemblyConfigurationAttribute("SNAPSHOT")]
-[assembly: AssemblyCompanyAttribute("http://activemq.apache.org/nms";)]
-[assembly: AssemblyProductAttribute("Apache NMS for EMS Class Library")]
-[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
-[assembly: AssemblyTrademarkAttribute("")]
-[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0")]
-
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.1433
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyTitleAttribute("Apache NMS for EMS Class Library")]
+[assembly: AssemblyDescriptionAttribute("Apache NMS for EMS Class Library
(.Net Messaging Library Implementation): An impl" +
+ "ementation of the NMS API for EMS")]
+[assembly: AssemblyConfigurationAttribute("SNAPSHOT")]
+[assembly: AssemblyCompanyAttribute("http://activemq.apache.org/nms";)]
+[assembly: AssemblyProductAttribute("Apache NMS for EMS Class Library")]
+[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
+[assembly: AssemblyTrademarkAttribute("")]
+[assembly: AssemblyCultureAttribute("")]
+[assembly: AssemblyVersionAttribute("1.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.0")]
+
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/CommonAssemblyInfo.cs?rev=644780&r1=644779&r2=644780&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
Fri Apr 4 10:16:02 2008
@@ -1,28 +1,28 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.1378
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyTitleAttribute("Apache NMS for EMS Class Library")]
-[assembly: AssemblyDescriptionAttribute("Apache NMS for EMS Class Library
(.Net Messaging Library Implementation): An impl" +
- "ementation of the NMS API for EMS")]
-[assembly: AssemblyConfigurationAttribute("SNAPSHOT")]
-[assembly: AssemblyCompanyAttribute("http://activemq.apache.org/nms";)]
-[assembly: AssemblyProductAttribute("Apache NMS for EMS Class Library")]
-[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
-[assembly: AssemblyTrademarkAttribute("")]
-[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0")]
-
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.1433
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyTitleAttribute("Apache NMS for EMS Class Library")]
+[assembly: AssemblyDescriptionAttribute("Apache NMS for EMS Class Library
(.Net Messaging Library Implementation): An impl" +
+ "ementation of the NMS API for EMS")]
+[assembly: AssemblyConfigurationAttribute("SNAPSHOT")]
+[assembly: AssemblyCompanyAttribute("http://activemq.apache.org/nms";)]
+[assembly: AssemblyProductAttribute("Apache NMS for EMS Class Library")]
+[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
+[assembly: AssemblyTrademarkAttribute("")]
+[assembly: AssemblyCultureAttribute("")]
+[assembly: AssemblyVersionAttribute("1.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.0")]
+
