Author: wade
Date: 2007-03-30 12:56:29 -0500 (Fri, 30 Mar 2007)
New Revision: 75222
Added:
trunk/release/conf/nant/nant-remove_overridden_obsolete.patch
trunk/release/conf/nant/nant-remove_pkgconfig_garbage.patch
Modified:
trunk/release/conf/nant/ximian-build.conf
Log:
ximian-build.conf:
-add 'exec' to shell wrapper
-add and enable patches for overridden obsolete mcs change
Added: trunk/release/conf/nant/nant-remove_overridden_obsolete.patch
===================================================================
--- trunk/release/conf/nant/nant-remove_overridden_obsolete.patch
2007-03-30 17:49:24 UTC (rev 75221)
+++ trunk/release/conf/nant/nant-remove_overridden_obsolete.patch
2007-03-30 17:56:29 UTC (rev 75222)
@@ -0,0 +1,20 @@
+--- ./src/NAnt.Core/Task.cs.orig 2007-03-06 12:19:02.000000000 -0700
++++ ./src/NAnt.Core/Task.cs 2007-03-06 12:19:57.000000000 -0700
+@@ -400,7 +400,9 @@
+ #region Protected Instance Methods
+
+ /// <summary><note>Deprecated (to be deleted).</note></summary>
+- [Obsolete("Deprecated- Use InitializeTask instead")]
++ // Obsolete shouldn't be allowed if the parent method isn't obsoleted
(which it isn't)
++ // csc allows this, but will warn in future versions
++ //[Obsolete("Deprecated- Use InitializeTask instead")]
+ protected override void InitializeElement(XmlNode elementNode) {
+ // Just defer for now so that everything just works
+ InitializeTask(elementNode);
+@@ -415,4 +417,4 @@
+
+ #endregion Protected Instance Methods
+ }
+-}
+\ No newline at end of file
++}
Added: trunk/release/conf/nant/nant-remove_pkgconfig_garbage.patch
===================================================================
--- trunk/release/conf/nant/nant-remove_pkgconfig_garbage.patch 2007-03-30
17:49:24 UTC (rev 75221)
+++ trunk/release/conf/nant/nant-remove_pkgconfig_garbage.patch 2007-03-30
17:56:29 UTC (rev 75222)
@@ -0,0 +1,13 @@
+diff -ur ../../nant-0.85/src/NAnt.Core/Functions/PkgConfigFunctions.cs
./src/NAnt.Core/Functions/PkgConfigFunctions.cs
+--- ../../nant-0.85/src/NAnt.Core/Functions/PkgConfigFunctions.cs
2005-10-10 16:51:26.000000000 +0200
++++ ./src/NAnt.Core/Functions/PkgConfigFunctions.cs 2006-11-21
00:35:28.000000000 +0100
+@@ -260,7 +260,8 @@
+ execTask.Execute();
+ ms.Position = 0;
+ StreamReader sr = new StreamReader(ms);
+- string output = sr.ReadLine();
++ // Temporary workaround Replace \x00 that sometimes gets
returned by this on 64bit... ?
++ string output = sr.ReadLine().Replace("\x00", "");
+ sr.Close();
+ return output;
+ } catch (Exception ex) {
Modified: trunk/release/conf/nant/ximian-build.conf
===================================================================
--- trunk/release/conf/nant/ximian-build.conf 2007-03-30 17:49:24 UTC (rev
75221)
+++ trunk/release/conf/nant/ximian-build.conf 2007-03-30 17:56:29 UTC (rev
75222)
@@ -8,6 +8,9 @@
<i>.*</i>
</filter>
<name>nant</name>
+ <!-- this will have to me manually updated, but it allows us to use
patches for a tarball that is not named
+ as it's extracted dirname. -->
+ <tardir>nant-0.85</tardir>
<psdata id="copyright">GPL</psdata>
<psdata id="url">http://nant.sourceforge.net</psdata>
@@ -16,9 +19,13 @@
<i>SVN https://svn.sourceforge.net/svnroot/nant</i>
</source>
+ <patch>
+ <i>nant-remove_pkgconfig_garbage.patch-1</i>
+ <i>nant-remove_overridden_obsolete.patch-2</i>
+ </patch>
+
<build id="default">
- <!-- fix for 64 bit -->
- <prepare>sed -i "s/sr.ReadLine()/sr.ReadLine().Replace(\"\\\x00\",
\"\")/" src/NAnt.Core/Functions/PkgConfigFunctions.cs</prepare>
+ <prepare>true</prepare>
<compile>${MAKE}</compile>
<install><![CDATA[
make install prefix=${DESTDIR}[[usrprefix]]
@@ -46,7 +53,7 @@
# Fix script
cat <<EOF > .[[usrprefix]]/bin/nant
#!/bin/sh
-`pkg-config mono --variable prefix`/bin/mono [[usrprefix]]/lib/NAnt/NAnt.exe
"\$@"
+exec `which mono` [[usrprefix]]/lib/NAnt/NAnt.exe "\$@"
EOF
chmod 755 .[[usrprefix]]/bin/nant
]]>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches