rpms/nant/devel nant-0.85-app.patch,NONE,1.1 nant.spec,1.22,1.23
Tom Callaway
spot at fedoraproject.org
Wed Dec 24 00:37:42 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/nant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3473
Modified Files:
nant.spec
Added Files:
nant-0.85-app.patch
Log Message:
hack for bootstrapping, will undo as soon as mono-sharpcvslib is built
nant-0.85-app.patch:
--- NEW FILE nant-0.85-app.patch ---
diff -up nant-0.85/src/NAnt.Console/App.config.orig nant-0.85/src/NAnt.Console/App.config
--- nant-0.85/src/NAnt.Console/App.config.orig 2006-08-05 04:44:04.000000000 -0400
+++ nant-0.85/src/NAnt.Console/App.config 2008-12-23 18:44:12.000000000 -0500
@@ -554,7 +554,7 @@
runtimeengine="${runtimeEngine}"
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}"
+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}"
clrversion="1.1.4322"
>
<task-assemblies>
@@ -589,8 +589,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>\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')}" />
+ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}" />
<!-- /doc is not supported in Mono 1.0.x -->
<property name="csc.supportsdocgeneration" value="false" />
@@ -610,8 +610,8 @@
are located in the <install root>\lib\mono\<profile>
directory
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
@@ -724,7 +724,7 @@
runtimeengine="${runtimeEngine}"
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50727"
>
<task-assemblies>
@@ -782,18 +782,18 @@
use the 1.0 profile version
-->
<!--
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, '@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 -->
<property name="resgen.tool" value="resgen" />
@@ -864,7 +864,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -875,7 +875,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -903,7 +903,7 @@
runtimeengine="${runtimeEngine}"
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50215"
>
<task-assemblies>
@@ -961,18 +961,18 @@
use the 1.0 profile version
-->
<!--
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, '@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 -->
<property name="resgen.tool" value="resgen" />
@@ -1043,7 +1043,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1054,7 +1054,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1082,7 +1082,7 @@
runtimeengine="${runtimeEngine}"
sdkdirectory="${sdkDirectory}"
frameworkdirectory="${frameworkDirectory}"
- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.40607"
>
<task-assemblies>
@@ -1140,18 +1140,18 @@
use the 1.0 profile version
-->
<!--
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0')}" />
-->
- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
+ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0')}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
<if test="${not file::exists(runtimeEngine)}">
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, '@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 -->
<property name="resgen.tool" value="resgen" />
@@ -1222,7 +1222,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1233,7 +1233,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nant.spec 18 Dec 2008 12:48:16 -0000 1.22
+++ nant.spec 24 Dec 2008 00:37:11 -0000 1.23
@@ -5,11 +5,11 @@
Summary: NAnt is a build tool for Mono and .NET
Name: nant
Version: 0.85
-Release: 22%{?dist}
+Release: 22%{?dist}.1
Epoch: 1
Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
Patch0: nant-build.patch
-Patch1: nant-app.patch
+Patch1: nant-0.85-app.patch
Patch2: nant-core-task.patch
Patch3: nant-0.85-api.patch
Patch4: nant-0.85-system-libs-and-no-nunit1.patch
@@ -37,9 +37,9 @@
%prep
%setup -q -n %{name}-%{version}
-sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1}
%patch1 -p1 -b .orig
-sed -i -e "s/%{mlib}/@LIBDIR@/" %{PATCH1}
+sed -i -e "s/@LIBDIR@/%{mlib}/" src/NAnt.Console/App.config
+sed -i -e "s|lib/|%{_lib}/|g" src/NAnt.Console/App.config
%patch0 -p1 -b .orig
%patch2 -p1 -b .orig
%patch3 -p1 -b .orig
@@ -53,27 +53,30 @@
sed -i 's/\r//' README.txt
sed -i 's/\r//' doc/releasenotes.html
# Clean out the prebuilt files
-rm -rf lib/*.dll lib/*.exe lib/mono/1.0/*.dll lib/mono/2.0/*.dll
+# HACK: Don't delete anything until we can bootstrap
+# rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe
+# rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll
# Copy in the system libs
-cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/
-cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/
-cp -p %{_libdir}/mono/log4net/log4net.dll lib/
-cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe
-
-cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/
-cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/
-cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/1.0/
-cp -p %{_libdir}/mono/1.0/nunit.core.dll lib/mono/1.0/
-cp -p %{_libdir}/mono/1.0/nunit.framework.dll lib/mono/1.0/
-cp -p %{_libdir}/mono/1.0/nunit.util.dll lib/mono/1.0/
-
-cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/2.0/
-cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/2.0/
-cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/2.0/
-cp -p %{_libdir}/mono/nunit22/nunit.core.dll lib/mono/2.0/
-cp -p %{_libdir}/mono/nunit22/nunit.framework.dll lib/mono/2.0/
-cp -p %{_libdir}/mono/nunit22/nunit.util.dll lib/mono/2.0/
+# HACK: Leave this alone while bootstrapping
+# cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/
+# cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe
+# cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/
+# cp -p %{_libdir}/mono/log4net/log4net.dll lib/
+
+# cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/
+# cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/
+# cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/1.0/
+# cp -p %{_libdir}/mono/1.0/nunit.core.dll lib/mono/1.0/
+# cp -p %{_libdir}/mono/1.0/nunit.framework.dll lib/mono/1.0/
+# cp -p %{_libdir}/mono/1.0/nunit.util.dll lib/mono/1.0/
+
+# cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/2.0/
+# cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/2.0/
+# cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/2.0/
+# cp -p %{_libdir}/mono/nunit22/nunit.core.dll lib/mono/2.0/
+# cp -p %{_libdir}/mono/nunit22/nunit.framework.dll lib/mono/2.0/
+# cp -p %{_libdir}/mono/nunit22/nunit.util.dll lib/mono/2.0/
%build
export MONO_PATH=%{buildroot}/%{mlib}
@@ -87,9 +90,10 @@
rm -rf %{buildroot}%{_datadir}/NAnt/doc
# Flush out the binary bits that we used to build
-rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
-rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
-rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe
+# HACK: Don't do this when we're bootstrapping
+# rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
+# rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
+# rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe
%clean
rm -rf %{buildroot}
@@ -111,6 +115,10 @@
%doc examples/* doc/help/*
%changelog
+* Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-22.1
+- bootstrapping hack
+- don't monkey with patches, bad form
+
* Thu Dec 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1:0.85-22
- rebuild
- removed BR mono-sharpcvslib-devel (circular dep with mono-sharpcvslib)
More information about the fedora-extras-commits
mailing list