Move the presence service out of the shell

.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

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
 

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

services/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = presence

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)

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')

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 =				\

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 = []

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'))

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)