mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00
Code Issues Releases Activity
526486f2a7
freebsd-ports/devel/nant/files/patch-src-NAnt.Console-App.config
Sunpoet Po-Chuan Hsieh 88bb1b60eb - Update patch files for removed gmcs in Mono 4
2015-05-30 14:38:34 +00:00

264 lines
16 KiB
Plaintext
Raw Blame History

Reference: https://github.com/nant/nant/issues/91
Obtained from: https://github.com/nant/nant/commit/69c8ee96493c5d953212397c8ca06c2392372ca4
https://github.com/nant/nant/commit/4ad065d009b043996d4ce2d25ce5031d81c6ce60
--- src/NAnt.Console/App.config.orig 2012-06-09 14:05:53 UTC
+++ src/NAnt.Console/App.config
@@ -1724,6 +1724,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
+ <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.5')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
<!-- for compatibility with Mono 1.0.x -->
<directory name="${frameworkAssemblyDirectory}" />
@@ -1782,6 +1783,14 @@
<if test="${version::parse(mono.version) >= version::parse('1.2.3.50')}">
<property name="resgen.supportsexternalfilereferences" value="true" />
</if>
+ <if test="${version::parse(mono.version) &lt; version::parse('3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${version::parse(mono.version) >= version::parse('3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="2"/>
+ </if>
<target name="configure-from-pkg-config">
<property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -1820,7 +1829,8 @@
<attribute name="managed">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">gmcs</attribute>
+ <attribute name="exename">${csc.tool}</attribute>
+ <attribute name="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1912,6 +1922,7 @@
</task-assemblies>
<tool-paths>
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
+ <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.5')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
<!-- unmanaged tools -->
@@ -1934,6 +1945,14 @@
<property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+ <if test="${version::parse(mono.version) &lt; version::parse('3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${version::parse(mono.version) >= version::parse('3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="2"/>
+ </if>
<target name="configure-from-pkg-config">
<property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -1972,7 +1991,8 @@
<attribute name="managed">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">gmcs</attribute>
+ <attribute name="exename">${csc.tool}</attribute>
+ <attribute name="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="langversion">linq</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -2067,6 +2087,7 @@
</task-assemblies>
<tool-paths>
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
+ <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.5')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
@@ -2090,6 +2111,14 @@
<property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+ <if test="${version::parse(mono.version) &lt; version::parse('3.0')}">
+ <property name="csc.tool" value="dmcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${version::parse(mono.version) >= version::parse('3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="4"/>
+ </if>
<target name="configure-from-pkg-config">
<property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -2128,7 +2157,8 @@
<attribute name="managed">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">dmcs</attribute>
+ <attribute name="exename">${csc.tool}</attribute>
+ <attribute name="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="langversion">linq</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -2212,6 +2242,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
+ <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/4.5')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
<directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
<!-- unmanaged tools -->
@@ -2234,6 +2265,14 @@
<property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.1')}" />
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+ <if test="${version::parse(mono.version) &lt; version::parse('3.0')}">
+ <property name="csc.tool" value="smcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${version::parse(mono.version) >= version::parse('3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="2.1"/>
+ </if>
<target name="configure-from-pkg-config">
<property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -2267,7 +2306,8 @@
</project>
<tasks>
<task name="csc">
- <attribute name="exename">smcs</attribute>
+ <attribute name="exename">${csc.tool}</attribute>
+ <attribute name="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -2502,6 +2542,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
+ <directory name="${path::combine(prefix, 'lib/mono/4.5')}" />
<directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
<!-- unmanaged tools -->
<directory name="${prefix}/bin" />
@@ -2526,13 +2567,22 @@
<if test="${pkg-config::is-atleast-version('mono', '1.2.3.50')}">
<property name="resgen.supportsexternalfilereferences" value="true" />
</if>
+ <if test="${not(pkg-config::is-atleast-version('mono', '3.0'))}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${pkg-config::is-atleast-version('mono', '3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="2"/>
+ </if>
</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="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -2616,6 +2666,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
+ <directory name="${path::combine(prefix, 'lib/mono/4.5')}" />
<directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
<directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
<!-- unmanaged tools -->
@@ -2628,13 +2679,22 @@
<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')}" />
+ <if test="${not(pkg-config::is-atleast-version('mono', '3.0'))}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${pkg-config::is-atleast-version('mono', '3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="2"/>
+ </if>
</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="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="langversion">linq</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -2721,6 +2781,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
+ <directory name="${path::combine(prefix, 'lib/mono/4.5')}" />
<directory name="${path::combine(prefix, 'lib/mono/3.5')}" />
<directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
<directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
@@ -2734,13 +2795,22 @@
<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')}" />
+ <if test="${not(pkg-config::is-atleast-version('mono', '3.0'))}">
+ <property name="csc.tool" value="dmcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${pkg-config::is-atleast-version('mono', '3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="4"/>
+ </if>
</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="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="langversion">linq</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -2824,6 +2894,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
+ <directory name="${path::combine(prefix, 'lib/mono/4.5')}" />
<directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
<directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
<!-- unmanaged tools -->
@@ -2835,10 +2906,19 @@
</if>
<property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
<property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.1')}" />
+ <if test="${not(pkg-config::is-atleast-version('mono', '3.0'))}">
+ <property name="csc.tool" value="smcs"/>
+ <property name="mcs.sdk" value="0"/>
+ </if>
+ <if test="${pkg-config::is-atleast-version('mono', '3.0')}">
+ <property name="csc.tool" value="mcs"/>
+ <property name="mcs.sdk" value="2.1"/>
+ </if>
</project>
<tasks>
<task name="csc">
- <attribute name="exename">smcs</attribute>
+ <attribute name="exename">${csc.tool}</attribute>
+ <attribute name="mcssdk">${mcs.sdk}</attribute>
<attribute name="managed">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
Reference in New Issue View Git Blame Copy Permalink