diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-24 14:24:39 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-24 14:24:39 (GMT) |
| commit | 7f39ed44e9427a0b045a8d5833b968a0807c9d8e (patch) | |
| tree | 06e3f372a274504565a7991e4a636bd8f0c44592 | |
| parent | 7e4002596614f82f579f58946eaf67f6b7b3b87f (diff) | |
More build fixes. Add a script for presence service.
| -rw-r--r-- | shell/Makefile.am | 7 | ||||
| -rw-r--r-- | shell/PresenceService/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/Session.py | 3 | ||||
| -rw-r--r-- | shell/data/Makefile.am | 4 | ||||
| -rwxr-xr-x | shell/sugar-presence-service | 5 |
5 files changed, 14 insertions, 7 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 5e1cbbb..ba55ef6 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,10 +1,11 @@ SUBDIRS = PresenceService data bin_SCRIPTS = \ - sugar \ + sugar \ sugar-activity \ - sugar-activity-factory \ - sugar-people + sugar-activity-factory \ + sugar-people \ + sugar-presence-service sugardir = $(pkgdatadir)/shell sugar_PYTHON = \ diff --git a/shell/PresenceService/Makefile.am b/shell/PresenceService/Makefile.am index 908b00e..e3cced4 100644 --- a/shell/PresenceService/Makefile.am +++ b/shell/PresenceService/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell +sugardir = $(pkgdatadir)/shell/PresenceService sugar_PYTHON = \ __init__.py \ Activity.py \ diff --git a/shell/Session.py b/shell/Session.py index 412dd73..cdea610 100644 --- a/shell/Session.py +++ b/shell/Session.py @@ -47,13 +47,14 @@ class MatchboxProcess(Process): class PresenceServiceProcess(Process): def __init__(self): - Process.__init__(self, "python shell/PresenceService/PresenceService.py",) + Process.__init__(self, "sugar-presence-service",) def get_name(self): return "PresenceService" def start(self): Process.start(self) + # FIXME we really need something better time.sleep(3) class Session: diff --git a/shell/data/Makefile.am b/shell/data/Makefile.am index 7a4ddf4..fa14d6b 100644 --- a/shell/data/Makefile.am +++ b/shell/data/Makefile.am @@ -1,7 +1,7 @@ -confdir = $(datadir) +confdir = $(pkgdatadir) conf_DATA = kbdconfig -imagesdir = $(datadir) +imagesdir = $(pkgdatadir) images_DATA = \ home-background.png diff --git a/shell/sugar-presence-service b/shell/sugar-presence-service new file mode 100755 index 0000000..d0f3884 --- /dev/null +++ b/shell/sugar-presence-service @@ -0,0 +1,5 @@ +#!/usr/bin/python + +from PresenceService import PresenceService + +PresenceService.main() |