Zeitgeist Framework

Merge lp:~thekorn/zeitgeist/fix-660423-make-run into lp:zeitgeist/0.1

  1. fix-660423-make-run
  2. Merge into 0.8-python
Proposed by Markus Korn
Status: Merged
Merged at revision: 1618
Proposed branch: lp:~thekorn/zeitgeist/fix-660423-make-run
Merge into: lp:zeitgeist/0.1
Diff against target: 18 lines (+11/-0)
1 file modified
Makefile.am (+11/-0)
To merge this branch: bzr merge lp:~thekorn/zeitgeist/fix-660423-make-run
Reviewer Review Type Date Requested Status
Siegfried Gevatter Approve
Review via email: mp+38542@code.launchpad.net

Commit message

Added `make run` target to the rootlevel Makefile (LP: #660423)

Description of the change

Added `make run` target to the rootlevel Makefile (LP: #660423)

This command makes sure the ontology is updated, zeitgeist-daemon.py and
zeitgeist-daemon are in sync and then runs zeitgeist-daemon.

To post a comment you must log in.
Revision history for this message
Siegfried Gevatter (rainct) wrote :

Nice. You may consider using ./zeitgeist-daemon.py though.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-10-13 15:33:17 +0000
3+++ Makefile.am 2010-10-15 14:43:34 +0000
4@@ -69,3 +69,14 @@
5 else \
6 echo "Cannot run the testsuite, tests are not shipped"; \
7 fi
8+
9+# do the right thing to start a daemon
10+# wrap commandline options
11+# * to run the daemon without any datahub, set ZG_NODATAHUB,
12+# * to use a certain log level, set ZG_LOGLEVEL=<log-level>
13+# example:
14+# make run ZG_LOGLEVEL=INFO ZG_NODATAHUB=1
15+ZG_DAEMON_ARGS := $(if $(ZG_LOGLEVEL), --log-level $(ZG_LOGLEVEL),)
16+ZG_DAEMON_ARGS += $(if $(ZG_NODATAHUB), --no-datahub,)
17+run: all
18+ ./zeitgeist-daemon $(ZG_DAEMON_ARGS)

Subscribers

People subscribed via source and target branches