Adapted scripts to mono 3.4

ninject · Apr 26, 2014 · e0bda7f · e0bda7f
1 parent 41b0136
commit e0bda7f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 32 deletions.
diff --git a/mvc1/Ninject.Web.Mvc.build b/mvc1/Ninject.Web.Mvc.build
@@ -6,8 +6,8 @@
 	<property name="product.duration" value="2008-2012" overwrite="false"/>
 	<property name="product.description" value="Ninject support for MVC" overwrite="false"/>
 	<property name="product.packagePostfix" value="1" overwrite="false"/>
-	<property name="product.platforms" value="net-3.5,net-4.0,net-4.5,mono-2.0,mono-3.5,mono-4.0"  overwrite="false"/>
-	<property name="product.buildserverPlatforms" value="net-3.5,net-4.0,mono-2.0,mono-3.5,mono-4.0"  overwrite="false"/>
+	<property name="product.platforms" value="net-3.5,net-4.0,net-4.5,mono-3.5,mono-4.0"  overwrite="false"/>
+	<property name="product.buildserverPlatforms" value="net-3.5,net-4.0,mono-3.5,mono-4.0"  overwrite="false"/>
 	<property name="dependencies" value="Ninject,Ninject.Web.Common"  overwrite="false"/>
 
 	<include buildfile="Ninject.include" />
@@ -19,7 +19,9 @@
 
 	<target name="core" depends="init">
 		<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
-			<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
+			<arg line="/filealign:512"/>
+      <arg value="-sdk:2" if="${string::contains(build.platform, 'mono-3.5')}"/>
+      <arg value="-sdk:4" if="${string::contains(build.platform, 'mono-4.0')}"/>
 			<sources basedir="${path.src}">
 				<include name="${build.asminfo}"/>
 				<include name="${product.name}/**/*.cs"/>

diff --git a/mvc1/Ninject.include b/mvc1/Ninject.include
@@ -343,13 +343,6 @@
 		<property name="nuget.add" value="false"/>
 		<property name="build.platform" value="netcf-3.5" overwrite="true"/>
 	</target>
-
-	<target name="config-platform-mono-2.0">
-		<property name="nant.settings.currentframework" value="mono-2.0"/>
-		<property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,MONO_20,NO_GENERIC_MOQ" />
-		<property name="nuget.add" value="false"/>
-		<property name="build.platform" value="mono-2.0" overwrite="true"/>
-	</target>
 
 	<target name="config-platform-mono-3.5">
 		<property name="nant.settings.currentframework" value="mono-3.5"/>

diff --git a/mvc2/Ninject.Web.Mvc.build b/mvc2/Ninject.Web.Mvc.build
@@ -5,8 +5,8 @@
 	<property name="product.company" value="Ninject Project Contributors" overwrite="false"/>
 	<property name="product.duration" value="2008-2012" overwrite="false"/>
 	<property name="product.description" value="Ninject support for MVC" overwrite="false"/>
-	<property name="product.platforms" value="net-3.5,net-4.0,mono-2.0,mono-3.5,mono-4.0"  overwrite="false"/>
-	<property name="product.buildserverPlatforms" value="net-3.5,net-4.0,mono-2.0,mono-3.5,mono-4.0"  overwrite="false"/>
+	<property name="product.platforms" value="net-3.5,net-4.0,mono-3.5,mono-4.0"  overwrite="false"/>
+	<property name="product.buildserverPlatforms" value="net-3.5,net-4.0,mono-3.5,mono-4.0"  overwrite="false"/>
 	<property name="product.packagePostfix" value="2" overwrite="false"/>
 	<property name="dependencies" value="Ninject,Ninject.Web.Common"  overwrite="false"/>
 
@@ -19,7 +19,9 @@
 
 	<target name="core" depends="init">
 		<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
-			<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
+			<arg line="/filealign:512"/>
+      <arg value="-sdk:2" if="${string::contains(build.platform, 'mono-3.5')}"/>
+      <arg value="-sdk:4" if="${string::contains(build.platform, 'mono-4.0')}"/>
 			<sources basedir="${path.src}">
 				<include name="${build.asminfo}"/>
 				<include name="${product.name}/**/*.cs"/>

diff --git a/mvc2/Ninject.include b/mvc2/Ninject.include
@@ -343,13 +343,6 @@
 		<property name="nuget.add" value="false"/>
 		<property name="build.platform" value="netcf-3.5" overwrite="true"/>
 	</target>
-
-	<target name="config-platform-mono-2.0">
-		<property name="nant.settings.currentframework" value="mono-2.0"/>
-		<property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,MONO_20,NO_GENERIC_MOQ" />
-		<property name="nuget.add" value="false"/>
-		<property name="build.platform" value="mono-2.0" overwrite="true"/>
-	</target>
 
 	<target name="config-platform-mono-3.5">
 		<property name="nant.settings.currentframework" value="mono-3.5"/>

diff --git a/mvc3/Ninject.include b/mvc3/Ninject.include
@@ -343,13 +343,6 @@
 		<property name="nuget.add" value="false"/>
 		<property name="build.platform" value="netcf-3.5" overwrite="true"/>
 	</target>
-
-	<target name="config-platform-mono-2.0">
-		<property name="nant.settings.currentframework" value="mono-2.0"/>
-		<property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,MONO_20,NO_GENERIC_MOQ" />
-		<property name="nuget.add" value="false"/>
-		<property name="build.platform" value="mono-2.0" overwrite="true"/>
-	</target>
 
 	<target name="config-platform-mono-3.5">
 		<property name="nant.settings.currentframework" value="mono-3.5"/>

diff --git a/tools/nant/NAnt.exe.config b/tools/nant/NAnt.exe.config
@@ -2941,6 +2941,7 @@
 
             <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
             <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+            <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
 
             <target name="configure-from-pkg-config">
               <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -2979,7 +2980,7 @@
               <attribute name="managed">true</attribute>
             </task>
             <task name="csc">
-              <attribute name="exename">gmcs</attribute>
+              <attribute name="exename">${csc.tool}</attribute>
               <attribute name="managed">true</attribute>
               <attribute name="langversion">linq</attribute>
               <attribute name="supportspackagereferences">true</attribute>
@@ -3096,6 +3097,7 @@
 
             <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
             <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+            <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
 
             <target name="configure-from-pkg-config">
               <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -3134,7 +3136,7 @@
               <attribute name="managed">true</attribute>
             </task>
             <task name="csc">
-              <attribute name="exename">dmcs</attribute>
+              <attribute name="exename">${csc.tool}</attribute>
               <attribute name="managed">true</attribute>
               <attribute name="langversion">linq</attribute>
               <attribute name="supportspackagereferences">true</attribute>
@@ -3534,7 +3536,7 @@
               <attribute name="managed">true</attribute>
             </task>
             <task name="csc">
-              <attribute name="exename">gmcs</attribute>
+              <attribute name="exename">mcs</attribute>
               <attribute name="managed">true</attribute>
               <attribute name="supportspackagereferences">true</attribute>
               <attribute name="supportsnowarnlist">true</attribute>
@@ -3543,6 +3545,7 @@
               <attribute name="supportskeyfile">true</attribute>
               <attribute name="supportsdelaysign">true</attribute>
               <attribute name="supportslangversion">true</attribute>
+              <arg value="--langversion:ISO-2" />
             </task>
             <task name="jsc">
               <attribute name="exename">mjs</attribute>
@@ -3629,13 +3632,14 @@
             <property name="resgen.supportsexternalfilereferences" value="false" />
             <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
             <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/3.5')}" />
+            <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
           </project>
           <tasks>
             <task name="al">
               <attribute name="managed">true</attribute>
             </task>
             <task name="csc">
-              <attribute name="exename">gmcs</attribute>
+              <attribute name="exename">${csc.tool}</attribute>
               <attribute name="managed">true</attribute>
               <attribute name="langversion">linq</attribute>
               <attribute name="supportspackagereferences">true</attribute>
@@ -3734,13 +3738,14 @@
             <property name="resgen.supportsexternalfilereferences" value="false" />
             <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
             <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/4.0')}" />
+            <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
           </project>
           <tasks>
             <task name="al">
               <attribute name="managed">true</attribute>
             </task>
             <task name="csc">
-              <attribute name="exename">dmcs</attribute>
+              <attribute name="exename">${csc.tool}</attribute>
               <attribute name="managed">true</attribute>
               <attribute name="langversion">linq</attribute>
               <attribute name="supportspackagereferences">true</attribute>