r22402 - in /desktop/unstable/pygobject/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Nov 20 18:43:50 2009
New Revision: 22402

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22402
Log:
* Split out make check runs in their own targets.
* Also make check the dbg builds.
* Don't make check when nocheck is in DEB_BUILD_OPTIONS; thanks
  Daniel Schepler.

Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/rules

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=22402&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Fri Nov 20 18:43:50 2009
@@ -1,6 +1,13 @@
 pygobject (2.20.0-2) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Suggest gir1.0-glib-2.0 instead of gobject-introspection-*.
+
+  [ Loïc Minier ]
+  * Split out make check runs in their own targets.
+  * Also make check the dbg builds.
+  * Don't make check when nocheck is in DEB_BUILD_OPTIONS; thanks
+    Daniel Schepler.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 19 Oct 2009 07:20:31 +0200
 

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=22402&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules [utf-8] Fri Nov 20 18:43:50 2009
@@ -71,7 +71,6 @@
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
 	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/usr/lib/pymodules/python$*
-	-PYTHON=/usr/bin/python$* $(MAKE) -C build-$* check
 	touch $@
 
 dbg-build-%/build-stamp: dbg-build-%/configure-stamp
@@ -80,6 +79,16 @@
 	touch $@
 
 build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
+
+check-%/check-stamp: build-%/build-stamp
+	-PYTHON=/usr/bin/python$* $(MAKE) -C build-$* check
+	touch $@
+
+dbg-check-%/check-stamp: dbg-build-%/build-stamp
+	-PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* check
+	touch $@
+
+check: $(PYVERS:%=check-%/check-stamp) $(PYVERS:%=dbg-build-%/check-stamp)
 
 build-%/install-stamp: build-%/build-stamp
 	dh_testdir
@@ -124,7 +133,9 @@
 	$(MAKE) -f debian/rules unpatch
 	dh_clean *.pyc */*.pyc
 
-binary-indep: install
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+binary-indep: install $(maybe_check)
 	dh_testdir
 	dh_testroot
 	dh_installdocs -i
@@ -141,7 +152,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: install
+binary-arch: install $(maybe_check)
 	dh_testdir
 	dh_testroot
 	dh_installdocs -s
@@ -163,4 +174,4 @@
 	dh_builddeb -s
 
 binary: binary-arch binary-indep
-.PHONY: patch unpatch build install clean binary-indep binary-arch binary
+.PHONY: patch unpatch build check install clean binary-indep binary-arch binary