Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-dotnet/nant/files: nant-0.86_beta1-refmono-nunit.patch nant-0.86_beta1-build.patch nant-0.86_beta1-nunit-2.4.8.patch nant-0.86_beta1-dropnunit1.patch
Date: Sun, 03 May 2009 20:29:39
Message-Id: E1M0iJd-0007tv-SQ@stork.gentoo.org
1 loki_val 09/05/03 20:29:37
2
3 Added: nant-0.86_beta1-refmono-nunit.patch
4 nant-0.86_beta1-build.patch
5 nant-0.86_beta1-nunit-2.4.8.patch
6 nant-0.86_beta1-dropnunit1.patch
7 Log:
8 Bump. USE=bootstrap introduced, allows linking against system libs when unset.
9 (Portage version: 2.2_rc28/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 dev-dotnet/nant/files/nant-0.86_beta1-refmono-nunit.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-refmono-nunit.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-refmono-nunit.patch?rev=1.1&content-type=text/plain
16
17 Index: nant-0.86_beta1-refmono-nunit.patch
18 ===================================================================
19 diff -NrU5 nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build
20 --- nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build 2009-05-03 17:04:46.000000000 +0200
21 +++ nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build 2009-05-03 17:05:03.000000000 +0200
22 @@ -15,12 +15,14 @@
23 <!-- common assembly-level attributes -->
24 <include name="../CommonAssemblyInfo.cs" />
25 </sources>
26 <references>
27 <include name="${build.dir}/bin/NAnt.Core.dll" />
28 - <include name="${lib.framework.dir}/nunit.framework.dll" />
29 </references>
30 + <pkg-references>
31 + <package name="mono-nunit"/>
32 + </pkg-references>
33 </csc>
34 <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit2Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit2Tasks.xml">
35 <nowarn>
36 <!-- do not report deprecation warnings -->
37 <warning number="0618" />
38 @@ -36,12 +38,12 @@
39 <include name="${lib.framework.dir}/NDoc.Core.dll" />
40 <!-- end workaround -->
41 <include name="${build.dir}/bin/NAnt.Core.dll" />
42 <include name="${build.dir}/bin/NAnt.NUnit.dll" />
43 <include name="${build.dir}/bin/NAnt.DotNetTasks.dll" />
44 - <include name="${lib.framework.dir}/nunit.framework.dll" />
45 - <include name="${lib.framework.dir}/nunit.core.dll" />
46 - <include name="${lib.framework.dir}/nunit.util.dll" />
47 </references>
48 + <pkg-references>
49 + <package name="mono-nunit"/>
50 + </pkg-references>
51 </csc>
52 </target>
53 </project>
54
55
56
57 1.1 dev-dotnet/nant/files/nant-0.86_beta1-build.patch
58
59 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-build.patch?rev=1.1&view=markup
60 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-build.patch?rev=1.1&content-type=text/plain
61
62 Index: nant-0.86_beta1-build.patch
63 ===================================================================
64 --- nant-0.85-rc4/NAnt.build 2006-06-02 20:07:52.000000000 +0100
65 +++ nant-0.85-rc4/NAnt-new.build 2006-09-16 00:56:44.000000000 +0100
66 @@ -807,13 +807,14 @@
67 </target>
68
69 <target name="install-linux" depends="build" if="${platform::is-unix()}">
70 - <property name="install.realprefix" value="/usr/local" />
71 + <property name="install.realprefix" value="/usr" />
72 <if test="${property::exists('install.prefix') and string::get-length(install.prefix) != 0}">
73 <property name="install.realprefix" value="${install.prefix}" />
74 </if>
75 <property name="install.bindir" value="${path::combine(install.realprefix, 'bin')}"/>
76 - <property name="install.share" value="${path::combine(install.realprefix, 'share')}"/>
77 - <property name="install.copylocation" value="${path::combine (install.share, 'NAnt')}"/>
78 + <property name="install.libdir" value="${path::combine(install.realprefix, '@LIB@')}"/>
79 + <property name="install.share" value="${path::combine(install.realprefix, '@LIB@')}"/>
80 + <property name="install.copylocation" value="${path::combine(install.libdir, 'NAnt')}"/>
81 <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}"/>
82 <echo message="Installing NAnt to '${install.copylocation}' ..." />
83
84
85
86
87 1.1 dev-dotnet/nant/files/nant-0.86_beta1-nunit-2.4.8.patch
88
89 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-nunit-2.4.8.patch?rev=1.1&view=markup
90 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-nunit-2.4.8.patch?rev=1.1&content-type=text/plain
91
92 Index: nant-0.86_beta1-nunit-2.4.8.patch
93 ===================================================================
94 #! /bin/sh /usr/share/dpatch/dpatch-run
95 ## 06_nunit_2.4.dpatch by Jelmer Vernooij <jelmer@×××××.org>
96 ##
97 ## All lines beginning with `## DP:' are a description of the patch.
98 ## DP: Update NUnit task to work with NUnit 2.4.7
99
100 @DPATCH@
101 diff -ur nant-0.85/src/NAnt.NUnit/NUnit2/NUnit2Task.cs nant-0.85.dfsg1-newnunit/src/NAnt.NUnit/NUnit2/NUnit2Task.cs
102 --- nant-0.85/src/NAnt.NUnit/NUnit2/NUnit2Task.cs 2006-04-23 19:53:12.000000000 +0200
103 +++ nant-0.85.dfsg1-newnunit/src/NAnt.NUnit/NUnit2/NUnit2Task.cs 2008-06-14 16:50:35.000000000 +0200
104 @@ -31,6 +31,7 @@
105 using System.Xml.XPath;
106
107 using NUnit.Core;
108 +using NUnit.Core.Filters;
109 using TestCase = NUnit.Core.TestCase;
110 using TestOutput = NUnit.Core.TestOutput;
111 using NUnit.Framework;
112 @@ -185,16 +186,16 @@
113 EventListener listener = new EventCollector(logWriter, logWriter);
114
115 foreach (NUnit2Test testElement in Tests) {
116 - IFilter categoryFilter = null;
117 + ITestFilter categoryFilter = null;
118
119 // include or exclude specific categories
120 string categories = testElement.Categories.Includes.ToString();
121 if (!StringUtils.IsNullOrEmpty(categories)) {
122 - categoryFilter = new CategoryFilter(categories.Split(','), false);
123 + categoryFilter = new CategoryFilter(categories.Split(','));
124 } else {
125 categories = testElement.Categories.Excludes.ToString();
126 if (!StringUtils.IsNullOrEmpty(categories)) {
127 - categoryFilter = new CategoryFilter(categories.Split(','), true);
128 + categoryFilter = new NotFilter(new CategoryFilter(categories.Split(',')));
129 }
130 }
131
132 @@ -203,27 +204,22 @@
133
134 try {
135 TestRunner runner = domain.CreateRunner(new FileInfo(testAssembly), testElement.AppConfigFile);
136 + TestPackage package = new TestPackage(testAssembly);
137
138 - Test test = null;
139 - if (testElement.TestName != null) {
140 - test = runner.Load(testAssembly, testElement.TestName);
141 - } else {
142 - test = runner.Load(testAssembly);
143 - }
144 -
145 - if (test == null) {
146 + bool test = runner.Load(package);
147 + if (!test) {
148 Log(Level.Warning, "Assembly \"{0}\" contains no tests.",
149 testAssembly);
150 continue;
151 }
152
153 - // set category filter
154 - if (categoryFilter != null) {
155 - runner.Filter = categoryFilter;
156 - }
157 -
158 + TestResult result;
159 // run test
160 - TestResult result = runner.Run(listener);
161 + if (categoryFilter != null) {
162 + result = runner.Run(listener, categoryFilter);
163 + } else {
164 + result = runner.Run(listener);
165 + }
166
167 // flush test output to log
168 logWriter.Flush();
169 @@ -371,7 +367,7 @@
170
171 #endregion Private Instance Methods
172
173 - private class EventCollector : LongLivingMarshalByRefObject, EventListener {
174 + private class EventCollector : MarshalByRefObject, EventListener {
175 private TextWriter outWriter;
176 private TextWriter errorWriter;
177 private string currentTestName;
178 @@ -382,10 +378,10 @@
179 this.currentTestName = string.Empty;
180 }
181
182 - public void RunStarted(Test[] tests) {
183 + public void RunStarted(string name, int testcount) {
184 }
185
186 - public void RunFinished(TestResult[] results) {
187 + public void RunFinished(TestResult result) {
188 }
189
190 public void RunFinished(Exception exception) {
191 @@ -395,11 +391,11 @@
192 currentTestName = string.Empty;
193 }
194
195 - public void TestStarted(TestCase testCase) {
196 - currentTestName = testCase.FullName;
197 + public void TestStarted(TestName testName) {
198 + currentTestName = testName.FullName;
199 }
200
201 - public void SuiteStarted(TestSuite suite) {
202 + public void SuiteStarted(TestName testName) {
203 }
204
205 public void SuiteFinished(TestSuiteResult suiteResult) {
206 @@ -423,4 +419,4 @@
207 }
208 }
209 }
210 -}
211 \ Kein Zeilenumbruch am Dateiende.
212 +}
213
214
215
216 1.1 dev-dotnet/nant/files/nant-0.86_beta1-dropnunit1.patch
217
218 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-dropnunit1.patch?rev=1.1&view=markup
219 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/nant/files/nant-0.86_beta1-dropnunit1.patch?rev=1.1&content-type=text/plain
220
221 Index: nant-0.86_beta1-dropnunit1.patch
222 ===================================================================
223 diff -NrU5 nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build
224 --- nant-0.86-beta1.orig/src/NAnt.NUnit/NAnt.NUnit.build 2009-05-03 16:38:14.000000000 +0200
225 +++ nant-0.86-beta1/src/NAnt.NUnit/NAnt.NUnit.build 2009-05-03 16:39:16.000000000 +0200
226 @@ -18,34 +18,10 @@
227 <references>
228 <include name="${build.dir}/bin/NAnt.Core.dll" />
229 <include name="${lib.framework.dir}/nunit.framework.dll" />
230 </references>
231 </csc>
232 - <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit1Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit1Tasks.xml">
233 - <nowarn>
234 - <!-- do not report warnings for missing XML comments -->
235 - <warning number="1591" />
236 - <!-- workaround for Mono bug #61902: do not report deprecation warnings -->
237 - <warning number="0618" if="${framework::get-family(framework::get-target-framework()) == 'mono'}" />
238 - </nowarn>
239 - <sources>
240 - <include name="NUnit1/**/*.cs"/>
241 - <!-- common assembly-level attributes -->
242 - <include name="../CommonAssemblyInfo.cs" />
243 - </sources>
244 - <references>
245 - <!-- temporary workaround for Mono Runtime bug #57602 -->
246 - <include name="${lib.framework.dir}/log4net.dll" />
247 - <!-- end workaround -->
248 - <include name="${build.dir}/bin/NAnt.Core.dll" />
249 - <include name="${build.dir}/bin/NAnt.NUnit.dll" />
250 - <include name="${lib.dir}/common/neutral/NUnitCore.dll" />
251 - </references>
252 - <resources>
253 - <include name="*.resx"/>
254 - </resources>
255 - </csc>
256 <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit2Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit2Tasks.xml">
257 <nowarn>
258 <!-- do not report deprecation warnings -->
259 <warning number="0618" />
260 </nowarn>
Report Message
Find on MARC Find on Google Groups