[gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-util/nunit/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-util/nunit/files/
@ 2016-07-18  6:54 Heather Cynede
  0 siblings, 0 replies; 3+ messages in thread
From: Heather Cynede @ 2016-07-18  6:54 UTC (permalink / raw
  To: gentoo-commits

commit:     90d9561ee1566b33cfdad8223a7d3586decb7a55
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sun Jul 17 03:06:19 2016 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 03:06:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=90d9561e

NUnit.Runners package is now created

 .../nunit/files/removing-2.0-compatibiility.patch  | 29 +++++++
 .../nunit/files/removing-tests-from-nproj.patch    | 12 +++
 dev-util/nunit/metadata.xml                        | 12 +++
 dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild   | 99 ++++++++++++++++++++++
 4 files changed, 152 insertions(+)

diff --git a/dev-util/nunit/files/removing-2.0-compatibiility.patch b/dev-util/nunit/files/removing-2.0-compatibiility.patch
new file mode 100644
index 0000000..56ff347
--- /dev/null
+++ b/dev-util/nunit/files/removing-2.0-compatibiility.patch
@@ -0,0 +1,29 @@
+diff --git a/src/NUnitEngine/mono-addins/Mono.Addins.csproj b/src/NUnitEngine/mono-addins/Mono.Addins.csproj
+index cb09546..7536d46 100644
+--- a/src/NUnitEngine/mono-addins/Mono.Addins.csproj
++++ b/src/NUnitEngine/mono-addins/Mono.Addins.csproj
+@@ -43,24 +41,6 @@
+   </ItemGroup>
+   <ItemGroup>
+     <Compile Include="AssemblyInfo.cs" />
+-    <Compile Include="Compatibility\Check.cs" />
+-    <Compile Include="Compatibility\Enumerable.cs" />
+-    <Compile Include="Compatibility\ExtensionAttribute.cs" />
+-    <Compile Include="Compatibility\Funcs.cs" />
+-    <Compile Include="Compatibility\Grouping.cs" />
+-    <Compile Include="Compatibility\HashPrimeNumbers.cs" />
+-    <Compile Include="Compatibility\HashSet.cs" />
+-    <Compile Include="Compatibility\IGrouping.cs" />
+-    <Compile Include="Compatibility\ILookup_T.cs" />
+-    <Compile Include="Compatibility\IOrderedEnumerable_T.cs" />
+-    <Compile Include="Compatibility\Lookup.cs" />
+-    <Compile Include="Compatibility\OrderedEnumerable.cs" />
+-    <Compile Include="Compatibility\OrderedSequence.cs" />
+-    <Compile Include="Compatibility\QuickSort.cs" />
+-    <Compile Include="Compatibility\SortContext.cs" />
+-    <Compile Include="Compatibility\SortDirection.cs" />
+-    <Compile Include="Compatibility\SortSequenceContext.cs" />
+-    <Compile Include="Compatibility\Tuple.cs" />
+     <Compile Include="Mono.Addins\ExtensionNode.cs" />
+     <Compile Include="Mono.Addins\ExtensionTree.cs" />
+     <Compile Include="Mono.Addins\TreeNode.cs" />

diff --git a/dev-util/nunit/files/removing-tests-from-nproj.patch b/dev-util/nunit/files/removing-tests-from-nproj.patch
new file mode 100644
index 0000000..8c117eb
--- /dev/null
+++ b/dev-util/nunit/files/removing-tests-from-nproj.patch
@@ -0,0 +1,12 @@
+diff --git a/NUnit.proj b/NUnit.proj
+index 31e4dab..a964b88 100644
+--- a/NUnit.proj
++++ b/NUnit.proj
+@@ -659,7 +659,6 @@
+ 
+     <!-- Addin tests -->
+     <EngineProjects Include="$(AddinSrcDir)\addin-tests\addin-tests.csproj" />
+-    <EngineProjects Include="$(AddinSrcDir)\nunit.v2.driver.tests\nunit.v2.driver.tests.csproj" />
+ 
+   </ItemGroup>
+ 

diff --git a/dev-util/nunit/metadata.xml b/dev-util/nunit/metadata.xml
new file mode 100644
index 0000000..b855da0
--- /dev/null
+++ b/dev-util/nunit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>dotnet@gentoo.org</email>
+		<description>Gentoo Dotnet Project</description>
+	</maintainer>
+	<use>
+		<flag name='developer'>enables debug information for any of debug and release builds</flag>
+		<flag name='nupkg'>creates local nuget package</flag>
+	</use>
+</pkgmetadata>

diff --git a/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild b/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild
new file mode 100644
index 0000000..b08be2b
--- /dev/null
+++ b/dev-util/nunit/nunit-2.6.4_p2015011102-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit mono-env nuget dotnet
+
+NAME="nunitv2"
+HOMEPAGE="https://github.com/nunit/${NAME}"
+
+EGIT_COMMIT="1b549f4f8b067518c7b54a5b263679adb83ccda4"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip"
+S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
+
+SLOT="2" # NUnit V2 IS NO LONGER MAINTAINED OR UPDATED.
+
+DESCRIPTION="NUnit test suite for mono applications"
+LICENSE="NUnit-License" # http://nunit.org/nuget/license.html
+KEYWORDS="~amd64 ~x86"
+USE_DOTNET="net45"
+IUSE="net45 developer debug gac nupkg doc"
+
+RDEPEND=">=dev-lang/mono-4.0.2.5
+	dev-util/nant[nupkg]
+"
+DEPEND="${RDEPEND}
+"
+
+S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
+FILE_TO_BUILD=nunit.sln
+METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
+
+# PN = Package name, for example vim.
+# PV = Package version (excluding revision, if any), for example 6.3.
+
+src_prepare() {
+	chmod -R +rw "${S}" || die
+	enuget_restore "${METAFILETOBUILD}"
+
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+	sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
+	sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
+	sed -i 's#\\#/#g' "${S}/nuget/"*.nuspec || die
+	sed -i "s#\${package.version}#$(get_version_component_range 1-3)#g" "${S}/nuget/"*.nuspec || die
+	sed -i "s#\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
+	sed -i "s#\${current.build.dir}#bin/${DIR}#g" "${S}/nuget/"*.nuspec || die
+	default
+}
+
+src_compile() {
+	exbuild "${METAFILETOBUILD}"
+	enuspec "${S}/nuget/nunit.nuspec"
+	enuspec "${S}/nuget/nunit.runners.nuspec"
+}
+
+src_install() {
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+
+	SLOTTEDDIR="/usr/share/nunit-${SLOT}/"
+	insinto "${SLOTTEDDIR}"
+	doins bin/${DIR}/*.{config,dll,exe}
+	# install: cannot stat 'bin/Release/*.mdb': No such file or directory
+	if use developer; then
+		doins bin/${DIR}/*.mdb
+	fi
+
+#	into /usr
+#	dobin ${FILESDIR}/nunit-console
+	make_wrapper nunit264 "mono ${SLOTTEDDIR}/nunit-console.exe"
+
+	if use gac; then
+		if use debug; then
+			DIR="Debug"
+		else
+			DIR="Release"
+		fi
+
+		egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll"
+	fi
+
+	if use doc; then
+#		dodoc ${WORKDIR}/doc/*.txt
+#		dohtml ${WORKDIR}/doc/*.html
+#		insinto /usr/share/${P}/samples
+#		doins -r ${WORKDIR}/samples/*
+		doins license.txt
+	fi
+
+	enupkg "${WORKDIR}/NUnit.$(get_version_component_range 1-3).nupkg"
+	enupkg "${WORKDIR}/NUnit.Runners.$(get_version_component_range 1-3).nupkg"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-util/nunit/files/
@ 2016-07-30  8:35 Mikhail Pukhlikov
  0 siblings, 0 replies; 3+ messages in thread
From: Mikhail Pukhlikov @ 2016-07-30  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     826d3c27f1c3d9877164a9cb5373c6db8d88ce47
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 03:05:05 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 03:05:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=826d3c27

engine package added

 .../nunit/files/nunit-3.0.1-nuget.nuspec.patch     | 20 ++++++++++++++++
 .../files/nunit-3.0.1-nunit.console.nuspec.patch   | 24 +++++++++++++++++++
 .../files/nunit-3.0.1-nunit.engine.nuspec.patch    | 16 +++++++++++++
 dev-util/nunit/nunit-3.0.1.ebuild                  | 28 +++++++++++++++-------
 4 files changed, 80 insertions(+), 8 deletions(-)

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
new file mode 100644
index 0000000..1a782db
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
@@ -0,0 +1,20 @@
+diff --git a/nuget/nunit.nuspec b/nuget/nunit.nuspec
+index 71634a9..b450080 100644
+--- a/nuget/nunit.nuspec
++++ b/nuget/nunit.nuspec
+@@ -32,15 +32,7 @@ Supported platforms:
+     <file src="LICENSE.txt" />
+     <file src="NOTICES.txt" />
+     <file src="CHANGES.txt" />
+-    <file src="bin/net-2.0/nunit.framework.dll" target="lib/net20" />
+-    <file src="bin/net-2.0/nunit.framework.xml" target="lib/net20" />
+-    <file src="bin/net-4.0/nunit.framework.dll" target="lib/net40" />
+-    <file src="bin/net-4.0/nunit.framework.xml" target="lib/net40" />
+     <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" />
+     <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" />
+-    <file src="bin/portable/nunit.framework.dll" target="lib/dotnet" />
+-    <file src="bin/portable/nunit.framework.xml" target="lib/dotnet" />
+-    <file src="bin/portable/nunit.framework.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+-    <file src="bin/portable/nunit.framework.xml" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+   </files>
+ </package>

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
new file mode 100644
index 0000000..db29255
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch
@@ -0,0 +1,24 @@
+diff --git a/nuget/nunit.console.nuspec b/nuget/nunit.console.nuspec
+index 7479f61..7c7e65f 100644
+--- a/nuget/nunit.console.nuspec
++++ b/nuget/nunit.console.nuspec
+@@ -25,8 +25,6 @@
+     <file src="CHANGES.txt" />
+     <file src="bin/nunit-agent.exe" target="tools" />
+     <file src="bin/nunit-agent.exe.config" target="tools" />
+-    <file src="bin/nunit-agent-x86.exe" target="tools" />
+-    <file src="bin/nunit-agent-x86.exe.config" target="tools" />
+     <file src="bin/nunit3-console.exe" target="tools" />
+     <file src="bin/nunit3-console.exe.config" target="tools" />
+     <file src="bin/nunit.engine.api.dll" target="tools" />
+@@ -34,10 +32,6 @@
+     <file src="bin/nunit.engine.dll" target="tools" />
+     <file src="bin/nunit.engine.addins" target="tools" />
+     <file src="bin/nunit.engine.addin.xml" target="tools" />
+-    <file src="bin/Mono.Cecil.dll" target="tools" />
+-    <file src="bin/addins/nunit.v2.driver.dll" target="tools/addins" />
+-    <file src="bin/addins/nunit.core.dll" target="tools/addins" />
+-    <file src="bin/addins/nunit.core.interfaces.dll" target="tools/addins" />
+     <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" />
+     <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" />
+     <file src="bin/addins/vs-project-loader.dll" target="tools/addins" />

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
new file mode 100644
index 0000000..c6920b0
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch
@@ -0,0 +1,16 @@
+diff --git a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec
+index 04086bf..53f3be6 100644
+--- a/nuget/nunit.engine.nuspec
++++ b/nuget/nunit.engine.nuspec
+@@ -23,10 +23,7 @@
+     <file src="CHANGES.txt" />
+     <file src="bin\nunit.engine.dll" target="lib" />
+     <file src="bin\nunit.engine.api.dll" target="lib" />
+-    <file src="bin\Mono.Cecil.dll" target="lib" />
+     <file src="bin\nunit-agent.exe" target="lib" />
+     <file src="bin\nunit-agent.exe.config" target="lib" />
+-    <file src="bin\nunit-agent-x86.exe" target="lib" />
+-    <file src="bin\nunit-agent-x86.exe.config" target="lib" />
+   </files>
+ </package>
+\ No newline at end of file

diff --git a/dev-util/nunit/nunit-3.0.1.ebuild b/dev-util/nunit/nunit-3.0.1.ebuild
index 1f11e9f..3ff9fc7 100644
--- a/dev-util/nunit/nunit-3.0.1.ebuild
+++ b/dev-util/nunit/nunit-3.0.1.ebuild
@@ -32,22 +32,30 @@ S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 FILE_TO_BUILD=NUnit.proj
 METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
 
+NUGET_PACKAGE_VERSION="$(get_version_component_range 1-3)"
+
 src_prepare() {
 	chmod -R +rw "${S}" || die
 	eapply "${FILESDIR}/nunit-3.0.1-removing-tests-from-nproj.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-nuget.nuspec.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-nunit.console.nuspec.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-nunit.engine.nuspec.patch"
 	enuget_restore "${METAFILETOBUILD}"
 
 	if use debug; then
 		DIR="Debug"
 	else
-		DIR="Release"
+		DIR=""
 	fi
-	sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
-	sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
+	
+	sed -i "s=\\\$version\\\$=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die
+	#sed -i "s=\\\${package.version}=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die
+	#sed -i '/test/d' "${S}/nuget/"*.nuspec || die
+	#sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
+	#sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
 	sed -i 's#\\#/#g' "${S}/nuget/"*.nuspec || die
-	sed -i "s#\${package.version}#$(get_version_component_range 1-3)#g" "${S}/nuget/"*.nuspec || die
-	sed -i "s#\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
-	sed -i "s#\${current.build.dir}#bin/${DIR}#g" "${S}/nuget/"*.nuspec || die
+	#sed -i "s#\\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
+	sed -i "s#bin/#bin/${DIR}/#g" "${S}/nuget/"*.nuspec || die
 	default
 }
 
@@ -55,6 +63,8 @@ src_compile() {
 	exbuild "${METAFILETOBUILD}"
 	enuspec "${S}/nuget/nunit.nuspec"
 	enuspec "${S}/nuget/nunit.runners.nuspec"
+	enuspec "${S}/nuget/nunit.console.nuspec"
+	enuspec "${S}/nuget/nunit.engine.nuspec"
 }
 
 src_install() {
@@ -94,6 +104,8 @@ src_install() {
 		doins LICENSE.txt NOTICES.txt CHANGES.txt
 	fi
 
-	enupkg "${WORKDIR}/NUnit.3.0.0.nupkg"
-	enupkg "${WORKDIR}/NUnit.Runners.$(get_version_component_range 1-3).nupkg"
+	enupkg "${WORKDIR}/NUnit.${NUNIT_PACKAGE_VERSION}.nupkg"
+	enupkg "${WORKDIR}/NUnit.Runners.${NUNIT_PACKAGE_VERSION}.nupkg"
+	enupkg "${WORKDIR}/NUnit.Console.${NUNIT_PACKAGE_VERSION}.nupkg"
+	enupkg "${WORKDIR}/NUnit.Engine.${NUNIT_PACKAGE_VERSION}.nupkg"
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-util/nunit/files/
@ 2017-06-02  8:19 Mikhail Pukhlikov
  0 siblings, 0 replies; 3+ messages in thread
From: Mikhail Pukhlikov @ 2017-06-02  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     aaa567dcf7ebfe065a905215a75777bc7b34c2b9
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun May 28 16:31:46 2017 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sun May 28 16:31:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=aaa567dc

change paths

 .../nunit/files/nunit-3.0.1-nuget.nuspec.patch     | 15 +++----
 .../files/nunit-3.0.1-nunit.console.nuspec.patch   | 48 ++++++++++++++--------
 .../files/nunit-3.0.1-nunit.engine.nuspec.patch    | 23 +++++++----
 dev-util/nunit/nunit-3.0.1-r2.ebuild               | 22 ++--------
 4 files changed, 57 insertions(+), 51 deletions(-)

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
index 1a782db..7a01978 100644
--- a/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
+++ b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
@@ -1,8 +1,7 @@
-diff --git a/nuget/nunit.nuspec b/nuget/nunit.nuspec
-index 71634a9..b450080 100644
---- a/nuget/nunit.nuspec
-+++ b/nuget/nunit.nuspec
-@@ -32,15 +32,7 @@ Supported platforms:
+diff -u -r a/nuget/nunit.nuspec b/nuget/nunit.nuspec
+--- a/nuget/nunit.nuspec	2015-12-02 05:52:00.000000000 +0300
++++ b/nuget/nunit.nuspec	2017-05-28 18:08:45.000000000 +0300
+@@ -32,15 +32,7 @@
      <file src="LICENSE.txt" />
      <file src="NOTICES.txt" />
      <file src="CHANGES.txt" />
@@ -10,11 +9,13 @@ index 71634a9..b450080 100644
 -    <file src="bin/net-2.0/nunit.framework.xml" target="lib/net20" />
 -    <file src="bin/net-4.0/nunit.framework.dll" target="lib/net40" />
 -    <file src="bin/net-4.0/nunit.framework.xml" target="lib/net40" />
-     <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" />
-     <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" />
+-    <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" />
+-    <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" />
 -    <file src="bin/portable/nunit.framework.dll" target="lib/dotnet" />
 -    <file src="bin/portable/nunit.framework.xml" target="lib/dotnet" />
 -    <file src="bin/portable/nunit.framework.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
 -    <file src="bin/portable/nunit.framework.xml" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
++    <file src="bin/$dir$/net-4.5/nunit.framework.dll" target="lib/net45" />
++    <file src="bin/$dir$/net-4.5/nunit.framework.xml" target="lib/net45" />
    </files>
  </package>

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
index db29255..4d6e8b9 100644
--- 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
@@ -1,24 +1,38 @@
-diff --git a/nuget/nunit.console.nuspec b/nuget/nunit.console.nuspec
-index 7479f61..7c7e65f 100644
---- a/nuget/nunit.console.nuspec
-+++ b/nuget/nunit.console.nuspec
-@@ -25,8 +25,6 @@
+--- a/nuget/nunit.console.nuspec	2015-12-02 05:52:00.000000000 +0300
++++ b/nuget/nunit.console.nuspec	2017-05-28 18:49:12.746449899 +0300
+@@ -23,23 +23,17 @@
+     <file src="LICENSE.txt" />
+     <file src="NOTICES.txt" />
      <file src="CHANGES.txt" />
-     <file src="bin/nunit-agent.exe" target="tools" />
-     <file src="bin/nunit-agent.exe.config" target="tools" />
+-    <file src="bin/nunit-agent.exe" target="tools" />
+-    <file src="bin/nunit-agent.exe.config" target="tools" />
 -    <file src="bin/nunit-agent-x86.exe" target="tools" />
 -    <file src="bin/nunit-agent-x86.exe.config" target="tools" />
-     <file src="bin/nunit3-console.exe" target="tools" />
-     <file src="bin/nunit3-console.exe.config" target="tools" />
-     <file src="bin/nunit.engine.api.dll" target="tools" />
-@@ -34,10 +32,6 @@
-     <file src="bin/nunit.engine.dll" target="tools" />
-     <file src="bin/nunit.engine.addins" target="tools" />
-     <file src="bin/nunit.engine.addin.xml" target="tools" />
+-    <file src="bin/nunit3-console.exe" target="tools" />
+-    <file src="bin/nunit3-console.exe.config" target="tools" />
+-    <file src="bin/nunit.engine.api.dll" target="tools" />
+-    <file src="bin/nunit.engine.api.xml" target="tools" />
+-    <file src="bin/nunit.engine.dll" target="tools" />
+-    <file src="bin/nunit.engine.addins" target="tools" />
+-    <file src="bin/nunit.engine.addin.xml" target="tools" />
 -    <file src="bin/Mono.Cecil.dll" target="tools" />
 -    <file src="bin/addins/nunit.v2.driver.dll" target="tools/addins" />
 -    <file src="bin/addins/nunit.core.dll" target="tools/addins" />
 -    <file src="bin/addins/nunit.core.interfaces.dll" target="tools/addins" />
-     <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" />
-     <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" />
-     <file src="bin/addins/vs-project-loader.dll" target="tools/addins" />
+-    <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" />
+-    <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" />
+-    <file src="bin/addins/vs-project-loader.dll" target="tools/addins" />
++    <file src="bin/$dir$/nunit-agent.exe" target="tools" />
++    <file src="bin/$dir$/nunit-agent.exe.config" target="tools" />
++    <file src="bin/$dir$/nunit3-console.exe" target="tools" />
++    <file src="bin/$dir$/nunit3-console.exe.config" target="tools" />
++    <file src="bin/$dir$/nunit.engine.api.dll" target="tools" />
++    <file src="bin/$dir$/nunit.engine.api.xml" target="tools" />
++    <file src="bin/$dir$/nunit.engine.dll" target="tools" />
++    <file src="bin/$dir$/nunit.engine.addins" target="tools" />
++    <file src="bin/$dir$/nunit.engine.addin.xml" target="tools" />
++    <file src="bin/$dir$/addins/nunit-v2-result-writer.dll" target="tools/addins" />
++    <file src="bin/$dir$/addins/nunit-project-loader.dll" target="tools/addins" />
++    <file src="bin/$dir$/addins/vs-project-loader.dll" target="tools/addins" />
+   </files>
+ </package>

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
index c6920b0..9713dc7 100644
--- 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
@@ -1,16 +1,21 @@
-diff --git a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec
-index 04086bf..53f3be6 100644
---- a/nuget/nunit.engine.nuspec
-+++ b/nuget/nunit.engine.nuspec
-@@ -23,10 +23,7 @@
+diff -u -r a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec
+--- a/nuget/nunit.engine.nuspec	2015-12-02 05:52:00.000000000 +0300
++++ b/nuget/nunit.engine.nuspec	2017-05-28 19:01:55.000000000 +0300
+@@ -21,12 +21,9 @@
+     <file src="LICENSE.txt" />
+     <file src="NOTICES.txt" />
      <file src="CHANGES.txt" />
-     <file src="bin\nunit.engine.dll" target="lib" />
-     <file src="bin\nunit.engine.api.dll" target="lib" />
+-    <file src="bin\nunit.engine.dll" target="lib" />
+-    <file src="bin\nunit.engine.api.dll" target="lib" />
 -    <file src="bin\Mono.Cecil.dll" target="lib" />
-     <file src="bin\nunit-agent.exe" target="lib" />
-     <file src="bin\nunit-agent.exe.config" target="lib" />
+-    <file src="bin\nunit-agent.exe" target="lib" />
+-    <file src="bin\nunit-agent.exe.config" target="lib" />
 -    <file src="bin\nunit-agent-x86.exe" target="lib" />
 -    <file src="bin\nunit-agent-x86.exe.config" target="lib" />
++    <file src="bin/$dir$/nunit.engine.dll" target="lib" />
++    <file src="bin/$dir$/nunit.engine.api.dll" target="lib" />
++    <file src="bin/$dir$/nunit-agent.exe" target="lib" />
++    <file src="bin/$dir$/nunit-agent.exe.config" target="lib" />
    </files>
  </package>
 \ No newline at end of file

diff --git a/dev-util/nunit/nunit-3.0.1-r2.ebuild b/dev-util/nunit/nunit-3.0.1-r2.ebuild
index 2dd2e98..af165c1 100644
--- a/dev-util/nunit/nunit-3.0.1-r2.ebuild
+++ b/dev-util/nunit/nunit-3.0.1-r2.ebuild
@@ -68,17 +68,12 @@ src_prepare() {
 	if use debug; then
 		DIR="Debug"
 	else
-		DIR=""
+		DIR="Release"
 	fi
 
 	sed -i "s=\\\$version\\\$=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die
-	#sed -i "s=\\\${package.version}=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die
-	#sed -i '/test/d' "${S}/nuget/"*.nuspec || die
-	#sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
-	#sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
 	sed -i 's#\\#/#g' "${S}/nuget/"*.nuspec || die
-	#sed -i "s#\\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
-	sed -i "s#bin/#bin/${DIR}/#g" "${S}/nuget/"*.nuspec || die
+	sed -i "s=\\\$dir\\\$=${DIR}=g" "${S}/nuget/"*.nuspec || die
 	default
 }
 
@@ -105,19 +100,10 @@ src_install() {
 		doins bin/${DIR}/*.mdb
 	fi
 
-#	into /usr
-#	dobin ${FILESDIR}/nunit-console
 	make_wrapper nunit "mono ${SLOTTEDDIR}/nunit-console.exe"
 
-	if use gac; then
-		if use debug; then
-			DIR="Debug"
-		else
-			DIR="Release"
-		fi
-
-		egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll"
-	fi
+	# https://stackoverflow.com/questions/36430417/is-there-a-nunit-console-runner-dll-for-nunit-3-0
+	# egacinstall "${S}/bin/${DIR}/nunit-console-runner.dll"
 
 	if use doc; then
 #		dodoc ${WORKDIR}/doc/*.txt


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-06-02  8:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-18  6:54 [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-util/nunit/files/ Heather Cynede
  -- strict thread matches above, loose matches on Subject: below --
2016-07-30  8:35 Mikhail Pukhlikov
2017-06-02  8:19 Mikhail Pukhlikov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox