rpms/nant/devel nant-app.patch,1.6,1.7
Alex Lancaster (alexlan)
fedora-extras-commits at redhat.com
Tue Apr 8 12:26:47 UTC 2008
Author: alexlan
Update of /cvs/pkgs/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16223
Modified Files:
nant-app.patch
Log Message:
Revert to 1.3 version of patch which was used in last working build.
nant-app.patch:
Index: nant-app.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant-app.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nant-app.patch 8 Apr 2008 01:56:59 -0000 1.6
+++ nant-app.patch 8 Apr 2008 12:26:32 -0000 1.7
@@ -12,7 +12,7 @@
@@ -578,8 +578,8 @@
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<property name="resgen.tool" value="monoresgen" />
- <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\@LIBDIR@\mono\<profile> -->
+ <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
- <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
- <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
+ <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mcs.exe')}" />
@@ -21,7 +21,7 @@
<property name="csc.supportsdocgeneration" value="false" />
@@ -599,8 +599,8 @@
- are located in the <install root>\@LIBDIR@\mono\<profile>
+ are located in the <install root>\lib\mono\<profile>
directory
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
@@ -188,7 +188,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
-- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/1.0')}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/1.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/1.0')}"
clrversion="1.1.4322"
>
@@ -197,7 +197,7 @@
<property name="csc.supportsdocgeneration" value="false" />
</if>
<if test="${pkg-config::is-atleast-version('mono', '1.1')}">
-- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
+- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
@@ -206,7 +206,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -215,7 +215,7 @@
<attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
@@ -224,7 +224,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
-- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50727"
>
@@ -233,10 +233,10 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
-- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
+- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
-- <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
+- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
@@ -245,7 +245,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -254,7 +254,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
@@ -263,7 +263,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
-- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50215"
>
@@ -272,10 +272,10 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
-- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
+- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
-- <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
+- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
@@ -284,7 +284,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -293,7 +293,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
@@ -302,7 +302,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
-- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.40607"
>
@@ -311,10 +311,10 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
-- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
+- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
-- <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
+- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
@@ -323,7 +323,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
@@ -332,7 +332,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
-- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
More information about the fedora-extras-commits
mailing list