[Pkg-cli-libs-commits] [nunit] 03/06: NUnit's build system uses NAnt to build nuget files, using NAnt targets. Our NUnit avoids the NAnt dependency (as it would be circular), so manually override the NAnt paths. Also, our NUnit.Runners.nupkg is very cut down compared to upstream, due to all sorts of stuff we don't need being in it - so strip the install list. In addition, "nuget pack" is not path-separator-agnostic, so hardcode UNIX / instead of Windows \
Jo Shields
directhex at moszumanska.debian.org
Mon Jun 29 12:15:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch master
in repository nunit.
commit bd60cb0c96cbc263464fdee0d7c45b3478a97cc2
Author: Jo Shields <jo.shields at xamarin.com>
Date: Mon Jun 29 12:37:30 2015 +0100
NUnit's build system uses NAnt to build nuget files, using NAnt targets. Our NUnit avoids the NAnt dependency (as it would be circular), so manually override the NAnt paths. Also, our NUnit.Runners.nupkg is very cut down compared to upstream, due to all sorts of stuff we don't need being in it - so strip the install list. In addition, "nuget pack" is not path-separator-agnostic, so hardcode UNIX / instead of Windows \
---
debian/patches/fixup_nuspec_and_avoid_nant.patch | 123 +++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 124 insertions(+)
diff --git a/debian/patches/fixup_nuspec_and_avoid_nant.patch b/debian/patches/fixup_nuspec_and_avoid_nant.patch
new file mode 100644
index 0000000..0e0ee94
--- /dev/null
+++ b/debian/patches/fixup_nuspec_and_avoid_nant.patch
@@ -0,0 +1,123 @@
+Index: nunit/nuget/nunit.mocks.nuspec
+===================================================================
+--- nunit.orig/nuget/nunit.mocks.nuspec 2014-09-16 11:47:13.930568164 +0100
++++ nunit/nuget/nunit.mocks.nuspec 2015-06-29 12:28:04.421174500 +0100
+@@ -2,7 +2,7 @@
+ <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <id>NUnit.Mocks</id>
+- <version>${package.version}</version>
++ <version>2.6.4</version>
+ <title>NUnit.Mocks</title>
+ <authors>Charlie Poole</authors>
+ <owners>Charlie Poole</owners>
+@@ -19,7 +19,7 @@
+ <tags>nunit test testing tdd mock framework</tags>
+ </metadata>
+ <files>
+- <file src="${project.base.dir}\license.txt" />
+- <file src="${current.build.dir}\framework\nunit.mocks.dll" target="lib" />
++ <file src="../license.txt" />
++ <file src="../bin/Debug/framework/nunit.mocks.dll" target="lib" />
+ </files>
+-</package>
+\ No newline at end of file
++</package>
+Index: nunit/nuget/nunit.nuspec
+===================================================================
+--- nunit.orig/nuget/nunit.nuspec 2014-09-26 11:44:33.604999882 +0100
++++ nunit/nuget/nunit.nuspec 2015-06-29 12:28:44.945175466 +0100
+@@ -2,7 +2,7 @@
+ <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <id>NUnit</id>
+- <version>${package.version}</version>
++ <version>2.6.4</version>
+ <title>NUnit</title>
+ <authors>Charlie Poole</authors>
+ <owners>Charlie Poole</owners>
+@@ -17,8 +17,8 @@
+ <tags>nunit test testing tdd framework fluent assert theory plugin addin</tags>
+ </metadata>
+ <files>
+- <file src="${project.base.dir}\license.txt" />
+- <file src="${current.build.dir}\framework\nunit.framework.dll" target="lib" />
+- <file src="${current.build.dir}\framework\nunit.framework.xml" target="lib" />
++ <file src="../license.txt" />
++ <file src="bin/Debug/framework/nunit.framework.dll" target="lib" />
++ <file src="bin/Debug/framework/nunit.framework.xml" target="lib" />
+ </files>
+-</package>
+\ No newline at end of file
++</package>
+Index: nunit/nuget/nunit.runners.nuspec
+===================================================================
+--- nunit.orig/nuget/nunit.runners.nuspec 2014-09-16 11:47:13.930568164 +0100
++++ nunit/nuget/nunit.runners.nuspec 2015-06-29 12:36:05.737185975 +0100
+@@ -2,7 +2,7 @@
+ <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <id>NUnit.Runners</id>
+- <version>${package.version}</version>
++ <version>2.6.4</version>
+ <title>NUnit.Runners</title>
+ <authors>Charlie Poole</authors>
+ <owners>Charlie Poole</owners>
+@@ -16,41 +16,19 @@
+ <tags>nunit test testing tdd runner</tags>
+ </metadata>
+ <files>
+- <file src="${project.base.dir}\license.txt" />
+- <file src="${current.build.dir}\agent.conf" target="tools" />
+- <file src="${current.build.dir}\agent.log.conf" target="tools" />
+- <file src="${current.build.dir}\launcher.log.conf" target="tools" />
+- <file src="${current.build.dir}\nunit.exe" target="tools" />
+- <file src="${current.build.dir}\nunit.exe.config" target="tools" />
+- <file src="${current.build.dir}\nunit.framework.dll" target="tools" />
+- <file src="${current.build.dir}\nunit-agent.exe" target="tools" />
+- <file src="${current.build.dir}\nunit-agent.exe.config" target="tools" />
+- <file src="${current.build.dir}\nunit-agent-x86.exe" target="tools" />
+- <file src="${current.build.dir}\nunit-agent-x86.exe.config" target="tools" />
+- <file src="${current.build.dir}\nunit-console.exe" target="tools" />
+- <file src="${current.build.dir}\nunit-console.exe.config" target="tools" />
+- <file src="${current.build.dir}\nunit-console-x86.exe" target="tools" />
+- <file src="${current.build.dir}\nunit-console-x86.exe.config" target="tools" />
+- <file src="${current.build.dir}\nunit-editor.exe" target="tools" />
+- <file src="${current.build.dir}\nunit-x86.exe" target="tools" />
+- <file src="${current.build.dir}\nunit-x86.exe.config" target="tools" />
+- <file src="${current.build.dir}\pnunit.framework.dll" target="tools" />
+- <file src="${current.build.dir}\pnunit.tests.dll" target="tools" />
+- <file src="${current.build.dir}\pnunit-agent.exe" target="tools" />
+- <file src="${current.build.dir}\pnunit-agent.exe.config" target="tools" />
+- <file src="${current.build.dir}\pnunit-launcher.exe" target="tools" />
+- <file src="${current.build.dir}\pnunit-launcher.exe.config" target="tools" />
+- <file src="${current.build.dir}\runpnunit.bat" target="tools" />
+- <file src="${current.build.dir}\test.conf" target="tools" />
+- <file src="${current.build.dir}\lib\log4net.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit.core.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit.core.interfaces.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit.uiexception.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit.uikit.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit.util.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit-console-runner.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\nunit-gui-runner.dll" target="tools\lib" />
+- <file src="${current.build.dir}\lib\Images\**\*.jpg" target="tools\lib\Images" />
+- <file src="${current.build.dir}\lib\Images\**\*.png" target="tools\lib\Images" />
++ <file src="../license.txt" />
++ <file src="../bin/Debug/nunit.exe" target="tools" />
++ <file src="../bin/Debug/nunit.exe.config" target="tools" />
++ <file src="../bin/Debug/framework/nunit.framework.dll" target="tools" />
++ <file src="../bin/Debug/nunit-console.exe" target="tools" />
++ <file src="../bin/Debug/nunit-console.exe.config" target="tools" />
++ <file src="/usr/lib/cli/log4net-1.2/log4net.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit.core.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit.core.interfaces.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit.uiexception.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit.uikit.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit.util.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit-console-runner.dll" target="tools/lib" />
++ <file src="../bin/Debug/lib/nunit-gui-runner.dll" target="tools/lib" />
+ </files>
+-</package>
+\ No newline at end of file
++</package>
diff --git a/debian/patches/series b/debian/patches/series
index 36d7200..12530f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fixup_nuspec_and_avoid_nant.patch
use_default_framework.patch
05_build_xml_doc_for_nunit.core.dpatch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/nunit.git
More information about the Pkg-cli-libs-commits
mailing list