From 408cf8a0c077812318faf3eea0860d6a00a4c7e2 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Fri, 13 May 2005 00:45:12 +0000 Subject: Bump. Includes fixes to make nant compile on mono-1.1.7, and now builds with the 2.0 profile if on mono-1.1.x (Portage version: 2.0.51.21-r1) --- dev-dotnet/nant/ChangeLog | 9 +- dev-dotnet/nant/Manifest | 3 + dev-dotnet/nant/files/digest-nant-0.85_rc3 | 1 + .../files/nant-0.85-rc3-mono-1.1.7-compat.diff | 178 +++++++++++++++++++++ dev-dotnet/nant/nant-0.85_rc3.ebuild | 77 +++++++++ 5 files changed, 267 insertions(+), 1 deletion(-) create mode 100644 dev-dotnet/nant/files/digest-nant-0.85_rc3 create mode 100644 dev-dotnet/nant/files/nant-0.85-rc3-mono-1.1.7-compat.diff create mode 100644 dev-dotnet/nant/nant-0.85_rc3.ebuild (limited to 'dev-dotnet') diff --git a/dev-dotnet/nant/ChangeLog b/dev-dotnet/nant/ChangeLog index 5fd354904b30..d1d1e8b53434 100644 --- a/dev-dotnet/nant/ChangeLog +++ b/dev-dotnet/nant/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-dotnet/nant # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/ChangeLog,v 1.1 2005/03/16 18:52:38 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/ChangeLog,v 1.2 2005/05/13 00:45:12 latexer Exp $ + +*nant-0.85_rc3 (13 May 2005) + + 13 May 2005; Peter Johanson + +files/nant-0.85-rc3-mono-1.1.7-compat.diff, +nant-0.85_rc3.ebuild: + Bump. Includes fixes to make nant compile on mono-1.1.7, and now builds + with the 2.0 profile if on mono-1.1.x *nant-0.85_rc2 (16 Mar 2005) diff --git a/dev-dotnet/nant/Manifest b/dev-dotnet/nant/Manifest index 80a3672f7c9b..1cd94a02be0c 100644 --- a/dev-dotnet/nant/Manifest +++ b/dev-dotnet/nant/Manifest @@ -1,6 +1,9 @@ MD5 74a1e8f3568cb14518f0e4d017f45fa1 nant-0.85_rc2.ebuild 1295 MD5 a9c82101789e748e6afcd74fb536a2fc ChangeLog 487 MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256 +MD5 43eac5bfc0946fb9124115fce4cac38c nant-0.85_rc3.ebuild 2119 MD5 4780780090572267e1371fd5386b2788 files/digest-nant-0.85_rc2 70 MD5 5f0141b7a8590cfe8e5dceb0d63c3d11 files/nant-0.85-rc2-profile.diff 592 MD5 130a6c23514ec41bc117c3059c9aaf7f files/nant-0.85-rc2-is-unix.diff 695 +MD5 54217cd904b8abdea6d05a48091ceda5 files/nant-0.85-rc3-mono-1.1.7-compat.diff 10113 +MD5 7127397acee3d62be717b2255c167009 files/digest-nant-0.85_rc3 70 diff --git a/dev-dotnet/nant/files/digest-nant-0.85_rc3 b/dev-dotnet/nant/files/digest-nant-0.85_rc3 new file mode 100644 index 000000000000..d70ff132c30f --- /dev/null +++ b/dev-dotnet/nant/files/digest-nant-0.85_rc3 @@ -0,0 +1 @@ +MD5 64867347ec78a0e67f8e510fa5e14ac9 nant-0.85-rc3-src.tar.gz 1965686 diff --git a/dev-dotnet/nant/files/nant-0.85-rc3-mono-1.1.7-compat.diff b/dev-dotnet/nant/files/nant-0.85-rc3-mono-1.1.7-compat.diff new file mode 100644 index 000000000000..42c683400ee8 --- /dev/null +++ b/dev-dotnet/nant/files/nant-0.85-rc3-mono-1.1.7-compat.diff @@ -0,0 +1,178 @@ +Only in nant-0.85-rc3: build +diff -aur nant-0.85-rc3-orig/src/NAnt.DotNet/Tasks/AssemblyInfoTask.cs nant-0.85-rc3/src/NAnt.DotNet/Tasks/AssemblyInfoTask.cs +--- nant-0.85-rc3-orig/src/NAnt.DotNet/Tasks/AssemblyInfoTask.cs 2005-04-16 07:55:12.000000000 -0400 ++++ nant-0.85-rc3/src/NAnt.DotNet/Tasks/AssemblyInfoTask.cs 2005-05-12 15:10:56.000000000 -0400 +@@ -323,7 +323,6 @@ + + private CodeLanguage _language; + private readonly ICodeGenerator _generator; +- private readonly AssemblyInfoTask _assemblyInfoTask; + + #endregion Private Instance Fields + +@@ -353,7 +352,6 @@ + + _generator = provider.CreateGenerator(); + _language = codeLanguage; +- _assemblyInfoTask = assemblyInfoTask; + } + + #endregion Public Instance Constructors +diff -aur nant-0.85-rc3-orig/src/NAnt.DotNet/Tasks/ScriptTask.cs nant-0.85-rc3/src/NAnt.DotNet/Tasks/ScriptTask.cs +--- nant-0.85-rc3-orig/src/NAnt.DotNet/Tasks/ScriptTask.cs 2005-04-16 07:55:12.000000000 -0400 ++++ nant-0.85-rc3/src/NAnt.DotNet/Tasks/ScriptTask.cs 2005-05-12 15:11:19.000000000 -0400 +@@ -502,12 +502,10 @@ + } + + internal class CompilerInfo { +- private LanguageId _lang; + public readonly ICodeCompiler Compiler; + public readonly ICodeGenerator CodeGen; + + public CompilerInfo(LanguageId languageId, CodeDomProvider provider) { +- _lang = languageId; + + Compiler = provider.CreateCompiler(); + CodeGen = provider.CreateGenerator(); +diff -aur nant-0.85-rc3-orig/src/NAnt.NUnit/NUnit1/XmlResultFormatter.cs nant-0.85-rc3/src/NAnt.NUnit/NUnit1/XmlResultFormatter.cs +--- nant-0.85-rc3-orig/src/NAnt.NUnit/NUnit1/XmlResultFormatter.cs 2004-12-23 22:54:08.000000000 -0500 ++++ nant-0.85-rc3/src/NAnt.NUnit/NUnit1/XmlResultFormatter.cs 2005-05-12 15:13:01.000000000 -0400 +@@ -172,13 +172,11 @@ + + #region Private Static Fields + +- const string ElementTestSuites = "testsuites"; + const string ElementTestSuite = "testsuite"; + const string ElementTestCase = "testcase"; + const string ElementError = "error"; + const string ElementFailure = "failure"; + +- const string AttributePackage = "package"; + const string AttributeName = "name"; + const string AttributeTime = "time"; + const string AttributeErrors = "errors"; +diff -aur nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/ChangeLogTask.cs nant-0.85-rc3/src/NAnt.SourceControl/Tasks/ChangeLogTask.cs +--- nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/ChangeLogTask.cs 2004-11-10 02:33:44.000000000 -0500 ++++ nant-0.85-rc3/src/NAnt.SourceControl/Tasks/ChangeLogTask.cs 2005-05-12 15:19:49.000000000 -0400 +@@ -65,8 +65,6 @@ + + #region Private Static Fields + +- private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); +- + #endregion Private Static Fields + + #region Public Instance Properties +diff -aur nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/CvsTask.cs nant-0.85-rc3/src/NAnt.SourceControl/Tasks/CvsTask.cs +--- nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/CvsTask.cs 2005-02-13 14:29:26.000000000 -0500 ++++ nant-0.85-rc3/src/NAnt.SourceControl/Tasks/CvsTask.cs 2005-05-12 15:20:19.000000000 -0400 +@@ -50,7 +50,6 @@ + public class CvsTask : AbstractCvsTask { + + #region Private Instance Fields +- private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + + private string _commandName; + #endregion +diff -aur nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/ExportTask.cs nant-0.85-rc3/src/NAnt.SourceControl/Tasks/ExportTask.cs +--- nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/ExportTask.cs 2004-12-30 14:45:54.000000000 -0500 ++++ nant-0.85-rc3/src/NAnt.SourceControl/Tasks/ExportTask.cs 2005-05-12 15:20:57.000000000 -0400 +@@ -76,10 +76,6 @@ + public class ExportTask : AbstractCvsTask { + #region Private Instance Fields + +- private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); +- +- private ArgumentCollection _exportFiles = new ArgumentCollection(); +- + #endregion + + #region Public Constants +@@ -190,10 +186,6 @@ + set {SetCommandOption("date", String.Format(CultureInfo.InvariantCulture,"\"-D {0}\"", DateParser.GetCvsDateString(value)), true);} + } + +- private bool HasDate { +- get {return !(null == CommandOptions["date"]);} +- } +- + /// + /// Specify a directory name to replace the module name. Valid names + /// include any valid filename, excluding path information. +diff -aur nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/RTagTask.cs nant-0.85-rc3/src/NAnt.SourceControl/Tasks/RTagTask.cs +--- nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/RTagTask.cs 2005-04-13 16:16:50.000000000 -0400 ++++ nant-0.85-rc3/src/NAnt.SourceControl/Tasks/RTagTask.cs 2005-05-12 15:21:16.000000000 -0400 +@@ -86,8 +86,6 @@ + + #region Private Static Fields + +- private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); +- + #endregion Private Static Fields + + #region Public Instance Properties +diff -aur nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/TagTask.cs nant-0.85-rc3/src/NAnt.SourceControl/Tasks/TagTask.cs +--- nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/TagTask.cs 2005-04-13 16:16:52.000000000 -0400 ++++ nant-0.85-rc3/src/NAnt.SourceControl/Tasks/TagTask.cs 2005-05-12 15:21:39.000000000 -0400 +@@ -87,8 +87,6 @@ + + #region Private Static Fields + +- private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); +- + #endregion Private Static Fields + + #region Public Instance Properties +diff -aur nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/UpdateTask.cs nant-0.85-rc3/src/NAnt.SourceControl/Tasks/UpdateTask.cs +--- nant-0.85-rc3-orig/src/NAnt.SourceControl/Tasks/UpdateTask.cs 2004-07-21 07:51:46.000000000 -0400 ++++ nant-0.85-rc3/src/NAnt.SourceControl/Tasks/UpdateTask.cs 2005-05-12 15:22:03.000000000 -0400 +@@ -198,9 +198,6 @@ + + #region Private Static Fields + +- private static readonly log4net.ILog Logger = +- log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); +- + #endregion Private Static Fields + + #region Public Constants +diff -aur nant-0.85-rc3-orig/tests/NAnt.Console/NAntTest.cs nant-0.85-rc3/tests/NAnt.Console/NAntTest.cs +--- nant-0.85-rc3-orig/tests/NAnt.Console/NAntTest.cs 2005-02-20 07:29:52.000000000 -0500 ++++ nant-0.85-rc3/tests/NAnt.Console/NAntTest.cs 2005-04-21 00:08:30.000000000 -0400 +@@ -54,9 +54,9 @@ + //check absolute + Assert.IsTrue(0 == ConsoleDriver.Main(new string[] {@"-buildfile:" + build1FileName}), "Using absolute filepath failed"); + //check relative path, should be resolvable via currentdirectory +- Assert.IsTrue(0 == ConsoleDriver.Main(new string[] {"-buildfile:.\\" + filename}), "Using relative filepath failed"); ++ Assert.IsTrue(0 == ConsoleDriver.Main(new string[] {"-buildfile:./" + filename}), "Using relative filepath failed"); + //check relative path, should be resolvable via currentdirectory +- Assert.IsTrue(0 == ConsoleDriver.Main(new string[] {"-buildfile:..\\foo\\" + filename}), "Using relative filepath failed"); ++ Assert.IsTrue(0 == ConsoleDriver.Main(new string[] {"-buildfile:../foo/" + filename}), "Using relative filepath failed"); + } catch (Exception e) { + e.ToString(); + errors = true; +diff -aur nant-0.85-rc3-orig/tests/NAnt.Core/ExceptionTest.cs nant-0.85-rc3/tests/NAnt.Core/ExceptionTest.cs +--- nant-0.85-rc3-orig/tests/NAnt.Core/ExceptionTest.cs 2004-12-26 23:11:18.000000000 -0500 ++++ nant-0.85-rc3/tests/NAnt.Core/ExceptionTest.cs 2005-05-12 15:22:48.000000000 -0400 +@@ -130,21 +130,6 @@ + Assert.IsTrue(ci.IsFamily, t.Name + description + " is not protected, must be protected."); + } + +- private void CheckPublicOrProtectedConstructor(Type t, string description, params Type[] parameters) { +- // locate constructor +- ConstructorInfo ci = t.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, parameters, null); +- // fail if constructor does not exist +- Assert.IsNotNull(ci, t.Name + description + " is a required constructor."); +- // fail if constructor is private +- Assert.IsFalse(ci.IsPrivate, t.Name + description + " is private, must be public or protected."); +- // fail if constructor is internal +- Assert.IsFalse(ci.IsAssembly, t.Name + description + " is internal, must be public or protected."); +- // fail if constructor is protected internal +- Assert.IsFalse(ci.IsFamilyOrAssembly, t.Name + description + " is protected internal, must be public or protected."); +- // sainty check to make sure the constructor is protected or public +- Assert.IsTrue(ci.IsPublic || ci.IsFamily, t.Name + description + " is not public or protected, must be public or protected."); +- } +- + private void CheckPrivateConstructor(Type t, string description, params Type[] parameters) { + // locate constructor + ConstructorInfo ci = t.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, parameters, null); diff --git a/dev-dotnet/nant/nant-0.85_rc3.ebuild b/dev-dotnet/nant/nant-0.85_rc3.ebuild new file mode 100644 index 000000000000..88d52cbd2af7 --- /dev/null +++ b/dev-dotnet/nant/nant-0.85_rc3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nant/nant-0.85_rc3.ebuild,v 1.1 2005/05/13 00:45:12 latexer Exp $ + +inherit mono eutils + +MY_P=${P/_rc/-rc} + +DESCRIPTION=".NET build tool" +HOMEPAGE="http://nant.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" +DEPEND="dev-lang/mono" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + local targetlibdir="" + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${PN}-0.85-rc2-is-unix.diff || die + epatch ${FILESDIR}/${PN}-0.85-rc2-profile.diff || die + epatch ${FILESDIR}/${MY_P}-mono-1.1.7-compat.diff || die + + # Fix a problem with duplicate building caused by the doc= target + for file in $(find ${S}/src -name '*.build') + do + sed -i "s: doc=.*>:>:" \ + ${file} + done + + # Problem with is-unix() on mono-1.1.x where the platform is detected + # as !is-unix(). + sed -i -e "s:install-windows, install-linux:install-linux:" \ + -e 's:if.*is-unix()}\"::' \ + ${S}/NAnt.build || die "sed failed" + + # When we have mono-1.1.x, we should build against 2.0, + # so that people using nant can use either the 2.0 or 1.0 profiles + if has_version ">=dev-lang/mono-1.1.4"; then + sed -i -e "s/-f:NAnt.build/-t:mono-2.0 -f:NAnt.build/" \ + ${S}/Makefile || die "sed failed" + + targetlibdir="${S}/build/mono-2.0.unix/nant-0.85-debug/bin/lib/" + else + # Fix for AppDomain unloading on 1.0.x. See bug #90113 + export MONO_NO_UNLOAD=1 + targetlibdir="${S}/build/mono-1.0.unix/nant-0.85-debug/bin/lib/" + fi + + # Fix for build problem with rc3 + mkdir -p "${targetlibdir}" + cp ${S}/lib/log4net.dll "${targetlibdir}" +} + +src_compile() { + emake -j1 || die +} + +src_install() { + make prefix=${D}/usr install || die + # Fix ${D} showing up in the nant wrapper script, as well as silencing + # warnings related to the log4net library + sed -i \ + -e "s:${D}::" \ + -e "2iexport MONO_SILENT_WARNING=1" \ + ${D}/usr/bin/nant + dodoc README.txt + + # Remove the extraneous log4net.dll copy + rm ${D}/usr/share/NAnt/bin/lib/log4net.dll +} -- cgit v1.2.3-65-gdbad