1 |
commit: aaa567dcf7ebfe065a905215a75777bc7b34c2b9 |
2 |
Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Sun May 28 16:31:46 2017 +0000 |
4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 28 16:31:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=aaa567dc |
7 |
|
8 |
change paths |
9 |
|
10 |
.../nunit/files/nunit-3.0.1-nuget.nuspec.patch | 15 +++---- |
11 |
.../files/nunit-3.0.1-nunit.console.nuspec.patch | 48 ++++++++++++++-------- |
12 |
.../files/nunit-3.0.1-nunit.engine.nuspec.patch | 23 +++++++---- |
13 |
dev-util/nunit/nunit-3.0.1-r2.ebuild | 22 ++-------- |
14 |
4 files changed, 57 insertions(+), 51 deletions(-) |
15 |
|
16 |
diff --git a/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch |
17 |
index 1a782db..7a01978 100644 |
18 |
--- a/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch |
19 |
+++ b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch |
20 |
@@ -1,8 +1,7 @@ |
21 |
-diff --git a/nuget/nunit.nuspec b/nuget/nunit.nuspec |
22 |
-index 71634a9..b450080 100644 |
23 |
---- a/nuget/nunit.nuspec |
24 |
-+++ b/nuget/nunit.nuspec |
25 |
-@@ -32,15 +32,7 @@ Supported platforms: |
26 |
+diff -u -r a/nuget/nunit.nuspec b/nuget/nunit.nuspec |
27 |
+--- a/nuget/nunit.nuspec 2015-12-02 05:52:00.000000000 +0300 |
28 |
++++ b/nuget/nunit.nuspec 2017-05-28 18:08:45.000000000 +0300 |
29 |
+@@ -32,15 +32,7 @@ |
30 |
<file src="LICENSE.txt" /> |
31 |
<file src="NOTICES.txt" /> |
32 |
<file src="CHANGES.txt" /> |
33 |
@@ -10,11 +9,13 @@ index 71634a9..b450080 100644 |
34 |
- <file src="bin/net-2.0/nunit.framework.xml" target="lib/net20" /> |
35 |
- <file src="bin/net-4.0/nunit.framework.dll" target="lib/net40" /> |
36 |
- <file src="bin/net-4.0/nunit.framework.xml" target="lib/net40" /> |
37 |
- <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" /> |
38 |
- <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" /> |
39 |
+- <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" /> |
40 |
+- <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" /> |
41 |
- <file src="bin/portable/nunit.framework.dll" target="lib/dotnet" /> |
42 |
- <file src="bin/portable/nunit.framework.xml" target="lib/dotnet" /> |
43 |
- <file src="bin/portable/nunit.framework.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" /> |
44 |
- <file src="bin/portable/nunit.framework.xml" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" /> |
45 |
++ <file src="bin/$dir$/net-4.5/nunit.framework.dll" target="lib/net45" /> |
46 |
++ <file src="bin/$dir$/net-4.5/nunit.framework.xml" target="lib/net45" /> |
47 |
</files> |
48 |
</package> |
49 |
|
50 |
diff --git a/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch b/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch |
51 |
index db29255..4d6e8b9 100644 |
52 |
--- a/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch |
53 |
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch |
54 |
@@ -1,24 +1,38 @@ |
55 |
-diff --git a/nuget/nunit.console.nuspec b/nuget/nunit.console.nuspec |
56 |
-index 7479f61..7c7e65f 100644 |
57 |
---- a/nuget/nunit.console.nuspec |
58 |
-+++ b/nuget/nunit.console.nuspec |
59 |
-@@ -25,8 +25,6 @@ |
60 |
+--- a/nuget/nunit.console.nuspec 2015-12-02 05:52:00.000000000 +0300 |
61 |
++++ b/nuget/nunit.console.nuspec 2017-05-28 18:49:12.746449899 +0300 |
62 |
+@@ -23,23 +23,17 @@ |
63 |
+ <file src="LICENSE.txt" /> |
64 |
+ <file src="NOTICES.txt" /> |
65 |
<file src="CHANGES.txt" /> |
66 |
- <file src="bin/nunit-agent.exe" target="tools" /> |
67 |
- <file src="bin/nunit-agent.exe.config" target="tools" /> |
68 |
+- <file src="bin/nunit-agent.exe" target="tools" /> |
69 |
+- <file src="bin/nunit-agent.exe.config" target="tools" /> |
70 |
- <file src="bin/nunit-agent-x86.exe" target="tools" /> |
71 |
- <file src="bin/nunit-agent-x86.exe.config" target="tools" /> |
72 |
- <file src="bin/nunit3-console.exe" target="tools" /> |
73 |
- <file src="bin/nunit3-console.exe.config" target="tools" /> |
74 |
- <file src="bin/nunit.engine.api.dll" target="tools" /> |
75 |
-@@ -34,10 +32,6 @@ |
76 |
- <file src="bin/nunit.engine.dll" target="tools" /> |
77 |
- <file src="bin/nunit.engine.addins" target="tools" /> |
78 |
- <file src="bin/nunit.engine.addin.xml" target="tools" /> |
79 |
+- <file src="bin/nunit3-console.exe" target="tools" /> |
80 |
+- <file src="bin/nunit3-console.exe.config" target="tools" /> |
81 |
+- <file src="bin/nunit.engine.api.dll" target="tools" /> |
82 |
+- <file src="bin/nunit.engine.api.xml" target="tools" /> |
83 |
+- <file src="bin/nunit.engine.dll" target="tools" /> |
84 |
+- <file src="bin/nunit.engine.addins" target="tools" /> |
85 |
+- <file src="bin/nunit.engine.addin.xml" target="tools" /> |
86 |
- <file src="bin/Mono.Cecil.dll" target="tools" /> |
87 |
- <file src="bin/addins/nunit.v2.driver.dll" target="tools/addins" /> |
88 |
- <file src="bin/addins/nunit.core.dll" target="tools/addins" /> |
89 |
- <file src="bin/addins/nunit.core.interfaces.dll" target="tools/addins" /> |
90 |
- <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" /> |
91 |
- <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" /> |
92 |
- <file src="bin/addins/vs-project-loader.dll" target="tools/addins" /> |
93 |
+- <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" /> |
94 |
+- <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" /> |
95 |
+- <file src="bin/addins/vs-project-loader.dll" target="tools/addins" /> |
96 |
++ <file src="bin/$dir$/nunit-agent.exe" target="tools" /> |
97 |
++ <file src="bin/$dir$/nunit-agent.exe.config" target="tools" /> |
98 |
++ <file src="bin/$dir$/nunit3-console.exe" target="tools" /> |
99 |
++ <file src="bin/$dir$/nunit3-console.exe.config" target="tools" /> |
100 |
++ <file src="bin/$dir$/nunit.engine.api.dll" target="tools" /> |
101 |
++ <file src="bin/$dir$/nunit.engine.api.xml" target="tools" /> |
102 |
++ <file src="bin/$dir$/nunit.engine.dll" target="tools" /> |
103 |
++ <file src="bin/$dir$/nunit.engine.addins" target="tools" /> |
104 |
++ <file src="bin/$dir$/nunit.engine.addin.xml" target="tools" /> |
105 |
++ <file src="bin/$dir$/addins/nunit-v2-result-writer.dll" target="tools/addins" /> |
106 |
++ <file src="bin/$dir$/addins/nunit-project-loader.dll" target="tools/addins" /> |
107 |
++ <file src="bin/$dir$/addins/vs-project-loader.dll" target="tools/addins" /> |
108 |
+ </files> |
109 |
+ </package> |
110 |
|
111 |
diff --git a/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch b/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch |
112 |
index c6920b0..9713dc7 100644 |
113 |
--- a/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch |
114 |
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch |
115 |
@@ -1,16 +1,21 @@ |
116 |
-diff --git a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec |
117 |
-index 04086bf..53f3be6 100644 |
118 |
---- a/nuget/nunit.engine.nuspec |
119 |
-+++ b/nuget/nunit.engine.nuspec |
120 |
-@@ -23,10 +23,7 @@ |
121 |
+diff -u -r a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec |
122 |
+--- a/nuget/nunit.engine.nuspec 2015-12-02 05:52:00.000000000 +0300 |
123 |
++++ b/nuget/nunit.engine.nuspec 2017-05-28 19:01:55.000000000 +0300 |
124 |
+@@ -21,12 +21,9 @@ |
125 |
+ <file src="LICENSE.txt" /> |
126 |
+ <file src="NOTICES.txt" /> |
127 |
<file src="CHANGES.txt" /> |
128 |
- <file src="bin\nunit.engine.dll" target="lib" /> |
129 |
- <file src="bin\nunit.engine.api.dll" target="lib" /> |
130 |
+- <file src="bin\nunit.engine.dll" target="lib" /> |
131 |
+- <file src="bin\nunit.engine.api.dll" target="lib" /> |
132 |
- <file src="bin\Mono.Cecil.dll" target="lib" /> |
133 |
- <file src="bin\nunit-agent.exe" target="lib" /> |
134 |
- <file src="bin\nunit-agent.exe.config" target="lib" /> |
135 |
+- <file src="bin\nunit-agent.exe" target="lib" /> |
136 |
+- <file src="bin\nunit-agent.exe.config" target="lib" /> |
137 |
- <file src="bin\nunit-agent-x86.exe" target="lib" /> |
138 |
- <file src="bin\nunit-agent-x86.exe.config" target="lib" /> |
139 |
++ <file src="bin/$dir$/nunit.engine.dll" target="lib" /> |
140 |
++ <file src="bin/$dir$/nunit.engine.api.dll" target="lib" /> |
141 |
++ <file src="bin/$dir$/nunit-agent.exe" target="lib" /> |
142 |
++ <file src="bin/$dir$/nunit-agent.exe.config" target="lib" /> |
143 |
</files> |
144 |
</package> |
145 |
\ No newline at end of file |
146 |
|
147 |
diff --git a/dev-util/nunit/nunit-3.0.1-r2.ebuild b/dev-util/nunit/nunit-3.0.1-r2.ebuild |
148 |
index 2dd2e98..af165c1 100644 |
149 |
--- a/dev-util/nunit/nunit-3.0.1-r2.ebuild |
150 |
+++ b/dev-util/nunit/nunit-3.0.1-r2.ebuild |
151 |
@@ -68,17 +68,12 @@ src_prepare() { |
152 |
if use debug; then |
153 |
DIR="Debug" |
154 |
else |
155 |
- DIR="" |
156 |
+ DIR="Release" |
157 |
fi |
158 |
|
159 |
sed -i "s=\\\$version\\\$=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die |
160 |
- #sed -i "s=\\\${package.version}=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die |
161 |
- #sed -i '/test/d' "${S}/nuget/"*.nuspec || die |
162 |
- #sed -i '/x86/d' "${S}/nuget/"*.nuspec || die |
163 |
- #sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die |
164 |
sed -i 's#\\#/#g' "${S}/nuget/"*.nuspec || die |
165 |
- #sed -i "s#\\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die |
166 |
- sed -i "s#bin/#bin/${DIR}/#g" "${S}/nuget/"*.nuspec || die |
167 |
+ sed -i "s=\\\$dir\\\$=${DIR}=g" "${S}/nuget/"*.nuspec || die |
168 |
default |
169 |
} |
170 |
|
171 |
@@ -105,19 +100,10 @@ src_install() { |
172 |
doins bin/${DIR}/*.mdb |
173 |
fi |
174 |
|
175 |
-# into /usr |
176 |
-# dobin ${FILESDIR}/nunit-console |
177 |
make_wrapper nunit "mono ${SLOTTEDDIR}/nunit-console.exe" |
178 |
|
179 |
- if use gac; then |
180 |
- if use debug; then |
181 |
- DIR="Debug" |
182 |
- else |
183 |
- DIR="Release" |
184 |
- fi |
185 |
- |
186 |
- egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll" |
187 |
- fi |
188 |
+ # https://stackoverflow.com/questions/36430417/is-there-a-nunit-console-runner-dll-for-nunit-3-0 |
189 |
+ # egacinstall "${S}/bin/${DIR}/nunit-console-runner.dll" |
190 |
|
191 |
if use doc; then |
192 |
# dodoc ${WORKDIR}/doc/*.txt |