From 5f99dcf9a5375847c970cfd769b3c85b84cf66b0 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 15 Sep 2006 13:54:16 +0200 Subject: [PATCH] Move the presence service out of the shell --- .gitignore | 2 +- Makefile.am | 2 +- configure.ac | 2 +- services/Makefile.am | 1 + {shell/PresenceService => services/presence}/Activity.py | 0 {shell/PresenceService => services/presence}/Buddy.py | 0 {shell/PresenceService => services/presence}/Makefile.am | 6 ++++-- .../presence}/PresenceService.py | 0 {shell/PresenceService => services/presence}/Service.py | 0 {shell/PresenceService => services/presence}/__init__.py | 0 .../presence}/org.laptop.Presence.service.in | 0 {shell => services/presence}/sugar-presence-service | 2 +- shell/Makefile.am | 5 ++--- sugar/__installed__.py.in | 3 ++- sugar/__uninstalled__.py.in | 2 ++ sugar/env.py | 3 ++- 16 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 services/Makefile.am rename {shell/PresenceService => services/presence}/Activity.py (100%) rename {shell/PresenceService => services/presence}/Buddy.py (100%) rename {shell/PresenceService => services/presence}/Makefile.am (74%) rename {shell/PresenceService => services/presence}/PresenceService.py (100%) rename {shell/PresenceService => services/presence}/Service.py (100%) rename {shell/PresenceService => services/presence}/__init__.py (100%) rename {shell/PresenceService => services/presence}/org.laptop.Presence.service.in (100%) rename {shell => services/presence}/sugar-presence-service (78%) diff --git a/.gitignore b/.gitignore index d0ca2394..ffd6362b 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,7 @@ po/*.gmo sugar/__installed__.py sugar/__uninstalled__.py tools/sugar-setup-activity -shell/PresenceService/org.laptop.Presence.service +services/presence/org.laptop.Presence.service threadframe config.guess config.sub diff --git a/Makefile.am b/Makefile.am index 72ff820f..323f1f43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = activities bindings po shell sugar tools +SUBDIRS = activities bindings po shell sugar services tools ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 52214ddb..7d50fb28 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,7 @@ activities/terminal/Makefile bindings/Makefile bindings/globalkeys/Makefile bindings/threadframe/Makefile +services/Makefile shell/Makefile shell/conf/Makefile shell/data/Makefile @@ -52,7 +53,6 @@ shell/view/Makefile shell/view/home/Makefile shell/view/frame/Makefile shell/model/Makefile -shell/PresenceService/Makefile sugar/Makefile sugar/__installed__.py sugar/__uninstalled__.py diff --git a/services/Makefile.am b/services/Makefile.am new file mode 100644 index 00000000..da404414 --- /dev/null +++ b/services/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = presence diff --git a/shell/PresenceService/Activity.py b/services/presence/Activity.py similarity index 100% rename from shell/PresenceService/Activity.py rename to services/presence/Activity.py diff --git a/shell/PresenceService/Buddy.py b/services/presence/Buddy.py similarity index 100% rename from shell/PresenceService/Buddy.py rename to services/presence/Buddy.py diff --git a/shell/PresenceService/Makefile.am b/services/presence/Makefile.am similarity index 74% rename from shell/PresenceService/Makefile.am rename to services/presence/Makefile.am index 1710d540..c095cb63 100644 --- a/shell/PresenceService/Makefile.am +++ b/services/presence/Makefile.am @@ -5,7 +5,7 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ -sugardir = $(pkgdatadir)/shell/PresenceService +sugardir = $(pkgdatadir)/services/presence sugar_PYTHON = \ __init__.py \ Activity.py \ @@ -13,6 +13,8 @@ sugar_PYTHON = \ PresenceService.py \ Service.py +bin_SCRIPTS = sugar-presence-service + DISTCLEANFILES = $(service_DATA) -EXTRA_DIST = $(service_in_files) +EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS) diff --git a/shell/PresenceService/PresenceService.py b/services/presence/PresenceService.py similarity index 100% rename from shell/PresenceService/PresenceService.py rename to services/presence/PresenceService.py diff --git a/shell/PresenceService/Service.py b/services/presence/Service.py similarity index 100% rename from shell/PresenceService/Service.py rename to services/presence/Service.py diff --git a/shell/PresenceService/__init__.py b/services/presence/__init__.py similarity index 100% rename from shell/PresenceService/__init__.py rename to services/presence/__init__.py diff --git a/shell/PresenceService/org.laptop.Presence.service.in b/services/presence/org.laptop.Presence.service.in similarity index 100% rename from shell/PresenceService/org.laptop.Presence.service.in rename to services/presence/org.laptop.Presence.service.in diff --git a/shell/sugar-presence-service b/services/presence/sugar-presence-service similarity index 78% rename from shell/sugar-presence-service rename to services/presence/sugar-presence-service index fda0d12c..88fd2e71 100755 --- a/shell/sugar-presence-service +++ b/services/presence/sugar-presence-service @@ -1,7 +1,7 @@ #!/usr/bin/python import logging -from PresenceService import PresenceService +from presence import PresenceService import sugar.logger sugar.logger.start('PresenceService') diff --git a/shell/Makefile.am b/shell/Makefile.am index 1bf373dc..a4fd7192 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,11 +1,10 @@ -SUBDIRS = conf data model view PresenceService +SUBDIRS = conf data model view bin_SCRIPTS = \ sugar \ sugar-activity \ sugar-activity-factory \ - sugar-console \ - sugar-presence-service + sugar-console sugardir = $(pkgdatadir)/shell sugar_PYTHON = \ diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index 5ebed29a..fd1b8554 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -6,5 +6,6 @@ sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' sugar_python_path = ['@prefix@/share/sugar/shell', '@prefix@/share/sugar/bindings', - '@prefix@/share/sugar/activities'] + '@prefix@/share/sugar/activities', + '@prefix@/share/sugar/services'] sugar_bin_path = [] diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in index 860cb21a..02b43f1c 100644 --- a/sugar/__uninstalled__.py.in +++ b/sugar/__uninstalled__.py.in @@ -14,6 +14,8 @@ sugar_python_path = ['@prefix@/share/sugar/bindings'] sugar_python_path.append(sugar_source_dir) sugar_python_path.append(os.path.join(sugar_source_dir, 'shell')) sugar_python_path.append(os.path.join(sugar_source_dir, 'activities')) +sugar_python_path.append(os.path.join(sugar_source_dir, 'services')) sugar_bin_path = [] sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell')) +sugar_bin_path.append(os.path.join(sugar_source_dir, 'services/presence')) diff --git a/sugar/env.py b/sugar/env.py index 8fc131a1..b0c5443c 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -43,7 +43,8 @@ def setup_system(): runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory') sugar.setup.setup_activities(source, sugar_activities_dir, runner) - bin = os.path.join(sugar_source_dir, 'shell/sugar-presence-service') + bin = os.path.join(sugar_source_dir, + 'services/presence/sugar-presence-service') sugar.setup.write_service('org.laptop.Presence', bin, sugar_activities_dir)