Added support for .NET Compact Framework 3.5. Sign the assemblies for Compact Framework builds. Removed obsolete configuration for .NET 1.1 Framework.
Fixes [AMQNET-229]. (See https://issues.apache.org/activemq/browse/AMQNET-229) Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-msmq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-msmq/commit/021ce555 Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-msmq/tree/021ce555 Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-msmq/diff/021ce555 Branch: refs/heads/1.4.x Commit: 021ce555033d69b92de8f8c0b78f53ebff088fb6 Parents: a749e57 Author: Jim Gomes <[email protected]> Authored: Mon Feb 8 19:46:31 2010 +0000 Committer: Jim Gomes <[email protected]> Committed: Mon Feb 8 19:46:31 2010 +0000 ---------------------------------------------------------------------- trunk/nant-common.xml | 28 ++++++++++++++-------------- trunk/nant.build | 1 + 2 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-nms-msmq/blob/021ce555/trunk/nant-common.xml ---------------------------------------------------------------------- diff --git a/trunk/nant-common.xml b/trunk/nant-common.xml index c5797dc..de5937f 100644 --- a/trunk/nant-common.xml +++ b/trunk/nant-common.xml @@ -41,7 +41,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" unless="${property::exists('build.framework.strings')}"/> + <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="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" /> @@ -194,18 +194,6 @@ <property name="csc.optimize" value="true" /> </target> - <target name="set-net-1.1-framework-configuration"> - <property name="current.build.framework" value="net-1.1" /> - <property name="current.build.framework.name" value=".NET 1.1" /> - <property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" /> - <property name="current.build.framework.sign" value="false" /> - <property name="link.sdkdoc.version" value="SDK_v1_1" /> - <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-2.0-framework-configuration"> <property name="current.build.framework" value="net-2.0" /> <property name="current.build.framework.name" value=".NET 2.0" /> @@ -234,7 +222,7 @@ <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)}"> @@ -242,6 +230,18 @@ </if> </target> + <target name="set-netcf-3.5-framework-configuration"> + <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="true" /> + <property name="link.sdkdoc.version" value="SDK_v3_5" /> + <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-mono-2.0-framework-configuration"> <property name="current.build.framework" value="mono-2.0" /> <property name="current.build.framework.name" value="Mono 2.0" /> http://git-wip-us.apache.org/repos/asf/activemq-nms-msmq/blob/021ce555/trunk/nant.build ---------------------------------------------------------------------- diff --git a/trunk/nant.build b/trunk/nant.build index 6e11f83..24e6e52 100644 --- a/trunk/nant.build +++ b/trunk/nant.build @@ -38,6 +38,7 @@ <!-- Skip certain frameworks, since MSMQ is not supported on those platforms. --> <property name="build.netcf-2.0.skip" value="true" /> + <property name="build.netcf-3.5.skip" value="true" /> <property name="build.mono-2.0.skip" value="true" /> <target name="vendor-init" description="Initializes Vendor library from local repository.">
