Markus Korn has proposed merging lp:~thekorn/zeitgeist/fix-628661-make-check-doc into lp:zeitgeist.
Requested reviews: Zeitgeist Framework Team (zeitgeist) Related bugs: #628661 Add `make doc` and `make check` targets to the rootlevel Makefile https://bugs.launchpad.net/bugs/628661 Adding 'make check' and 'make doc' to fix bug 628661. -- https://code.launchpad.net/~thekorn/zeitgeist/fix-628661-make-check-doc/+merge/34431 Your team Zeitgeist Framework Team is requested to review the proposed merge of lp:~thekorn/zeitgeist/fix-628661-make-check-doc into lp:zeitgeist.
=== modified file 'Makefile.am' --- Makefile.am 2010-06-17 21:22:15 +0000 +++ Makefile.am 2010-09-02 15:15:53 +0000 @@ -28,6 +28,8 @@ zeitgeist-daemon \ zeitgeist-datahub +TESTS = test/run-all-tests.py + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = zeitgeist-daemon.pc @@ -62,3 +64,9 @@ 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 === modified file 'doc/Makefile.am' --- doc/Makefile.am 2009-12-16 08:59:10 +0000 +++ doc/Makefile.am 2010-09-02 15:15:53 +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-02 15:15:53 +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-02 15:15:53 +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__), ".."))
_______________________________________________ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp