sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove get_service_path and use the usual wrapper script approach.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2008-02-05 01:02:33 +01:00
parent ae5ce06ccb
commit aca3ae6c88
7 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/.gitignore vendored
View File

@ -1,2 +1,3 @@
sugar-control-panel sugar-control-panel
sugar-shell sugar-shell
sugar-shell-service

3
bin/Makefile.am
View File

@ -5,7 +5,8 @@ bin_SCRIPTS = \
sugar-control-panel \ sugar-control-panel \
sugar-install-bundle \ sugar-install-bundle \
sugar-launch \ sugar-launch \
sugar-shell sugar-shell \
sugar-shell-service
EXTRA_DIST = $(bin_SCRIPTS) sugar.in EXTRA_DIST = $(bin_SCRIPTS) sugar.in

26
bin/sugar-shell-service.in Normal file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env python
# Copyright (C) 2008, Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import sys
sys.path.insert(0, '@prefix@/share/sugar/service')
from main import main
main()

1
configure.ac
View File

@ -43,6 +43,7 @@ AC_CONFIG_FILES([
bin/sugar bin/sugar
bin/sugar-control-panel bin/sugar-control-panel
bin/sugar-shell bin/sugar-shell
bin/sugar-shell-service
src/config.py src/config.py
]) ])

3
lib/sugar/env.py
View File

@ -77,8 +77,5 @@ def get_user_activities_path():
def get_user_library_path(): def get_user_library_path():
return os.path.expanduser('~/Library') return os.path.expanduser('~/Library')
def get_service_path(name):
return _get_sugar_path('services', name)
def get_data_path(path=None): def get_data_path(path=None):
return _get_sugar_path('data', path) return _get_sugar_path('data', path)

10
service/Makefile.am
View File

@ -17,18 +17,16 @@ org.laptop.Clipboard.service: org.laptop.Clipboard.service.in Makefile
org.laptop.ObjectTypeRegistry.service: org.laptop.ObjectTypeRegistry.service.in Makefile org.laptop.ObjectTypeRegistry.service: org.laptop.ObjectTypeRegistry.service.in Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@ @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
sugardir = $(pkgdatadir)/services/shell sugardir = $(pkgdatadir)/service
sugar_PYTHON = \ sugar_PYTHON = \
__init__.py \ __init__.py \
activityregistryservice.py \ activityregistryservice.py \
bundleregistry.py \ bundleregistry.py \
clipboardobject.py \ clipboardobject.py \
clipboardservice.py clipboardservice.py \
main.py
bin_SCRIPTS = sugar-shell-service
DISTCLEANFILES = $(service_DATA) DISTCLEANFILES = $(service_DATA)
EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS) EXTRA_DIST = $(service_in_files)

8
service/sugar-shell-service → service/main.py
View File

@ -1,6 +1,3 @@
#!/usr/bin/env python
# vi: ts=4 ai noet
#
# Copyright (C) 2006, Red Hat, Inc. # Copyright (C) 2006, Red Hat, Inc.
# Copyright (C) 2007, One Laptop Per Child # Copyright (C) 2007, One Laptop Per Child
# #
@ -28,11 +25,10 @@ import dbus.glib
from sugar import logger from sugar import logger
from sugar import env from sugar import env
sys.path.append(env.get_service_path('shell'))
import clipboardservice
import activityregistryservice import activityregistryservice
import clipboardservice
def main():
logger.start('shellservice') logger.start('shellservice')
logging.info('Starting shell service.') logging.info('Starting shell service.')