svn commit: r1403589 - in /activemq/activemq-dotnet/Apache.NMS/trunk: nant-common.xml nant.build

[jg...@apache.org]

Author: jgomes
Date: Tue Oct 30 00:27:53 2012
New Revision: 1403589

URL: http://svn.apache.org/viewvc?rev=1403589&view=rev
Log:
Add support for Mono 4.0 builds.

Modified:
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/nant.build

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=1403589&r1=1403588&r2=1403589&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Oct 30 00:27:53 2012
@@ -46,7 +46,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,net-4.0,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,mono-4.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" />
@@ -272,6 +272,18 @@
         </if>
     </target>
 
+    <target name="set-mono-4.0-framework-configuration">
+        <property name="current.build.framework" value="mono-4.0" />
+        <property name="current.build.framework.name" value="Mono 4.0" />
+        <property name="current.build.defines" value="${build.defines}MONO,MONO_4_0" dynamic="true" />
+        <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)}">
+            <property name="nant.settings.currentframework" value="${current.build.framework}" />
+        </if>
+    </target>
+
     <!-- ============================================================================================ -->
     <!--     C O M P I L E    T A R G E T S                                                           -->
     <!-- ============================================================================================ -->

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=1403589&r1=1403588&r2=1403589&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Tue Oct 30 00:27:53 2012
@@ -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 == 'net-4.0' 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' or current.build.framework == 'mono-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" />
@@ -76,7 +76,7 @@
                 <include name="${current.build.framework.assembly.dir}/System.Transactions.dll" />
             </assemblyfileset>
         </if>
-        <if test="${current.build.framework != 'net-3.5' and current.build.framework != 'net-4.0'}">
+        <if test="${current.build.framework != 'net-3.5' and current.build.framework != 'net-4.0' and current.build.framework != 'mono-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" />