[Pkg-mono-svn-commits] rev 2577 - in non-group/nunit/trunk/debian: . patches

Jelmer Vernooij ctrlsoft-guest at costa.debian.org
Tue Jun 20 11:26:29 UTC 2006 

Author: ctrlsoft-guest
Date: 2006-06-20 11:26:28 +0000 (Tue, 20 Jun 2006)
New Revision: 2577

Added:
   non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch
Modified:
   non-group/nunit/trunk/debian/changelog
   non-group/nunit/trunk/debian/control
   non-group/nunit/trunk/debian/patches/00list
   non-group/nunit/trunk/debian/rules
Log:
Start building mono 2.0 binaries.


Modified: non-group/nunit/trunk/debian/changelog
===================================================================
--- non-group/nunit/trunk/debian/changelog	2006-06-19 19:01:29 UTC (rev 2576)
+++ non-group/nunit/trunk/debian/changelog	2006-06-20 11:26:28 UTC (rev 2577)
@@ -1,3 +1,9 @@
+nunit (2.2.8-2) unstable; urgency=low
+
+  * Build mono-2.0 binaries.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Tue, 20 Jun 2006 13:25:49 +0200
+
 nunit (2.2.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: non-group/nunit/trunk/debian/control
===================================================================
--- non-group/nunit/trunk/debian/control	2006-06-19 19:01:29 UTC (rev 2576)
+++ non-group/nunit/trunk/debian/control	2006-06-20 11:26:28 UTC (rev 2577)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
 Build-Depends: debhelper (>= 4.0.0), dpatch
-Build-Depends-Indep: mono-mcs (>= 1.0) | c-sharp-compiler, cli-common-dev (>= 0.4.0), libmono-dev (>= 1.0), nant (>= 0.84), mono-gac (>= 1.1.6)
+Build-Depends-Indep: mono-mcs (>= 1.0) | c-sharp-compiler, c-sharp-2.0-compiler, cli-common-dev (>= 0.4.0), libmono-dev (>= 1.0), nant (>= 0.84), mono-gac (>= 1.1.6)
 Standards-Version: 3.6.2.1
 
 Package: nunit-console

Modified: non-group/nunit/trunk/debian/patches/00list
===================================================================
--- non-group/nunit/trunk/debian/patches/00list	2006-06-19 19:01:29 UTC (rev 2576)
+++ non-group/nunit/trunk/debian/patches/00list	2006-06-20 11:26:28 UTC (rev 2577)
@@ -0,0 +1 @@
+01_mono-2.0.dpatch

Added: non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch	2006-06-19 19:01:29 UTC (rev 2576)
+++ non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch	2006-06-20 11:26:28 UTC (rev 2577)
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_mono-2.0.dpatch by Jelmer Vernooij <jelmer at samba.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix dir seperator for POSIX
+
+ at DPATCH@
+
+diff -ur orig/src/nunit.build nunit-2.2.8/src/nunit.build
+--- orig/src/nunit.build	2006-02-11 14:22:42.000000000 +0100
++++ nunit-2.2.8/src/nunit.build	2006-06-20 12:57:23.000000000 +0200
+@@ -24,6 +24,7 @@
+         net-1.1   Microsoft .NET version 1.1
+         net-2.0   Microsoft .NET version 2.0
+         mono-1.0  Mono version 1.0 (or installed version)
++		mono-2.0  Mono for .NET Framework 2.0
+     
+         Debug and release versions of each of these may be built
+ 
+diff -ur orig/src/nunit.build.include nunit-2.2.8/src/nunit.build.include
+--- orig/src/nunit.build.include	2006-04-21 16:29:58.000000000 +0200
++++ nunit-2.2.8/src/nunit.build.include	2006-06-20 12:58:14.000000000 +0200
+@@ -39,6 +39,10 @@
+     <call target="set-mono-1.0-runtime-config"/>
+   </target>
+ 
++  <target name="mono-2.0" description="Set runtime to Mono">
++    <call target="set-mono-2.0-runtime-config"/>
++  </target>
++
+   <!-- Init global settings -->
+   <target name="init-global-settings">
+ 
+@@ -72,7 +76,7 @@
+     <!-- Frameworks supported by this build script. The first
+          installed framework found is the default for builds. --> 
+     <property name="supported.frameworks" 
+-      value="net-1.1,net-1.0,net-2.0,mono-1.0"/>
++      value="net-1.1,net-1.0,net-2.0,mono-1.0,mono-2.0"/>
+   
+     <!-- Visual Studio locations -->
+     <if test="${platform::is-win32()}">
+@@ -239,6 +243,21 @@
+     <property name="msi.runtime.suffix" value="-mono"/>
+   </target>
+ 
++  <target name="set-mono-2.0-runtime-config">
++    <fail unless="${framework::sdk-exists( 'mono-2.0' )}"
++      message="The Mono 2.0 SDK is not configured or not installed"/>
++
++    <property name="runtime.platform" value="mono"/>
++    <property name="runtime.version" value="2.0"/>
++    <property name="runtime.config" value="mono-2.0"/>
++    <property name="build.mono" value="true"/>
++    <property name="build.win32" value="false"/>
++    <property name="nant.settings.currentframework" 
++      value="mono-2.0"/>
++    <property name="zip.runtime.suffix" value="-mono"/>
++    <property name="msi.runtime.suffix" value="-mono"/>
++  </target>
++
+   <!-- Set up the build directory -->
+   <target name="set-build-dir"
+     depends="set-build-config,set-runtime-config">


Property changes on: non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: non-group/nunit/trunk/debian/rules
===================================================================
--- non-group/nunit/trunk/debian/rules	2006-06-19 19:01:29 UTC (rev 2576)
+++ non-group/nunit/trunk/debian/rules	2006-06-20 11:26:28 UTC (rev 2577)
@@ -2,7 +2,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-BUILDDIR = src/build/mono/1.0/release
+BUILDDIR1 = src/build/mono/1.0/release
+BUILDDIR2 = src/build/mono/2.0/release
 export MONO_SHARED_DIR=$(CURDIR)
 NANT = nant
 
@@ -13,6 +14,7 @@
 build-stamp:
 	dh_testdir
 	$(NANT) /f:src/nunit.build mono-1.0 release build
+	$(NANT) /f:src/nunit.build mono-2.0 release build
 	touch build-stamp
 
 clean: unpatch
@@ -20,6 +22,7 @@
 	dh_testroot
 	rm -rf build
 	-$(NANT) /f:src/nunit.build mono-1.0 clean-all
+	-$(NANT) /f:src/nunit.build mono-2.0 clean-all
 	rm -f build-stamp
 	rm -rf .wapi
 	dh_clean
@@ -29,6 +32,7 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	# mono-1.0
 	gacutil -root debian/libnunit2.2.6-cil/usr/lib -i $(BUILDDIR)/nunit.framework.dll 
 	gacutil -root debian/libnunit2.2.6-cil/usr/lib -i $(BUILDDIR)/nunit.core.dll
 	gacutil -root debian/libnunit2.2.6-cil/usr/lib -i $(BUILDDIR)/nunit.util.dll
@@ -39,6 +43,8 @@
 		$(BUILDDIR)/nunit.mocks.dll \
 		$(BUILDDIR)/nunit.util.dll \
 		/usr/lib/cli/nunit-2.2.6
+	# mono-2.0
+	# FIXME
 	mkdir -p debian/nunit-console/usr/bin
 	cp debian/nunit-console.sh debian/nunit-console/usr/bin/nunit-console
 	chmod 755 debian/nunit-console/usr/bin/nunit-console

More information about the Pkg-mono-svn-commits mailing list