Merge lp:~thekorn/zeitgeist/fix-628661-make-check-doc into lp:zeitgeist/0.1

[Markus Korn]

Adding 'make check' and 'make doc' commands to the rootlevel makefile (LP: #628661)

Adding 'make check' and 'make doc' to fix bug 628661.

[Siegfried Gevatter (rainct)]

Great.

review: Approve

[Markus Korn (thekorn)]

Hmm, seems like it's not working, `make distcheck` fails

review: Needs Fixing

[lp:~thekorn/zeitgeist/fix-628661-make-check-doc]

1567. By Markus Korn on 2010-09-03

Test if the testsuite is available to avoid errors in `make dictcheck` as we
do not ship the tests in our builds

=== modified file 'Makefile.am'
--- Makefile.am	2010-06-17 21:22:15 +0000
+++ Makefile.am	2010-09-03 10:20:59 +0000
@@ -62,3 +62,20 @@
 	else \
 			echo A Bazaar branch is required to generate the ChangeLog >&2; \
 	fi
+
+# create API documentation
+doc: all
+	make -C doc/zeitgeist html
+	
+.PHONY: doc
+
+# hook into the `make check` command to run the testsuite
+# if the testsuite is not available (e.g. in the tarball) do nothing
+# but printing a message
+check-local:
+	@if test -e "test/run-all-tests.py"; \
+		then \
+			test/run-all-tests.py; \
+	else \
+		echo "Cannot run the testsuite, tests are not shipped"; \
+	fi
 
=== modified file 'doc/Makefile.am'
--- doc/Makefile.am	2009-12-16 08:59:10 +0000
+++ doc/Makefile.am	2010-09-03 10:20:59 +0000
@@ -5,3 +5,6 @@
 EXTRA_DIST = \
 	$(man_MANS) \
 	zeitgeist
+
+clean: clean-am
+	make -C zeitgeist/ clean
 
=== added file 'po/POTFILES.skip'
--- po/POTFILES.skip	1970-01-01 00:00:00 +0000
+++ po/POTFILES.skip	2010-09-03 10:20:59 +0000
@@ -0,0 +1,1 @@
+tools/gtk/zeitgeist-data-sources-gtk.py
 
=== modified file 'test/run-all-tests.py'
--- test/run-all-tests.py	2010-05-15 13:05:14 +0000
+++ test/run-all-tests.py	2010-09-03 10:20:59 +0000
@@ -7,8 +7,17 @@
 import logging
 import sys
 
-# redirect all debugging output to stderr
-logging.basicConfig(stream=sys.stderr)
+from optparse import OptionParser
+parser = OptionParser()
+parser.add_option("-v", action="count", dest="verbosity")
+(options, args) = parser.parse_args()
+
+if options.verbosity:
+	# do more fine grained stuff later
+	# redirect all debugging output to stderr
+	logging.basicConfig(stream=sys.stderr)
+else:
+	logging.basicConfig(filename="/dev/null")
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))