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

Cleanup Bundle to not require SUGAR_PREFIX to

Browse Source 
be set. Also start using properties rather than
set/getters.
This commit is contained in:
Marco Pesenti Gritti 2007-09-03 23:08:49 +02:00
parent 382910b0ba
commit 3617dd1635
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,3 +1,5 @@
* #3025: Make bundlebuilder work even if SUGAR_PREFIX is not set. (marco)
Snapshot 0b3f687749 Snapshot 0b3f687749
* #3088: Fix style of zoom buttons palettes. (marco) * #3088: Fix style of zoom buttons palettes. (marco)

2
services/shell/bundleregistry.py
View File

@ -56,7 +56,7 @@ class _ServiceManager(object):
def add(self, bundle): def add(self, bundle):
util.write_service(bundle.get_service_name(), util.write_service(bundle.get_service_name(),
bundle.get_exec(), self._path) bundle.get_command(), self._path)
class BundleRegistry(gobject.GObject): class BundleRegistry(gobject.GObject):
"""Service that tracks the available activity bundles""" """Service that tracks the available activity bundles"""

2
sugar/activity/activityfactoryservice.py
View File

@ -163,4 +163,4 @@ def run(bundle_path):
_sugarext.set_application_name(bundle.get_name()) _sugarext.set_application_name(bundle.get_name())
factory = ActivityFactoryService(bundle.get_service_name(), factory = ActivityFactoryService(bundle.get_service_name(),
bundle.get_class()) bundle.activity_class)

27
sugar/activity/bundle.py
View File

@ -59,6 +59,9 @@ class Bundle:
self._init_with_path(path) self._init_with_path(path)
def _init_with_path(self, path): def _init_with_path(self, path):
self.activity_class = None
self.bundle_exec = None
self._name = None self._name = None
self._icon = None self._icon = None
self._service_name = None self._service_name = None
@ -116,18 +119,10 @@ class Bundle:
logging.error('%s must specify a name' % self._path) logging.error('%s must specify a name' % self._path)
if cp.has_option(section, 'class'): if cp.has_option(section, 'class'):
self._class = cp.get(section, 'class') self.activity_class = cp.get(section, 'class')
self._exec = '%s --bundle-path="%s"' % (
env.get_bin_path(_PYTHON_FACTORY), self._path)
elif cp.has_option(section, 'exec'): elif cp.has_option(section, 'exec'):
self._class = None self.bundle_exec = cp.get(section, 'exec')
cmdline = cp.get(section, 'exec')
cmdline = os.path.join(self._path, cmdline)
cmdline = cmdline.replace('$SUGAR_BUNDLE_PATH', self._path)
cmdline = os.path.expandvars(cmdline)
self._exec = cmdline
else: else:
self._exec = None
self._valid = False self._valid = False
logging.error('%s must specify exec or class' % self._path) logging.error('%s must specify exec or class' % self._path)
@ -232,9 +227,17 @@ class Bundle:
"""Get the activity version""" """Get the activity version"""
return self._activity_version return self._activity_version
def get_exec(self): def get_command(self):
"""Get the command to execute to launch the activity factory""" """Get the command to execute to launch the activity factory"""
return self._exec if self.bundle_exec:
command = os.path.join(self._path, self.bundle_exec)
command = command.replace('$SUGAR_BUNDLE_PATH', self._path)
command = os.path.expandvars(command)
else:
command = '%s --bundle-path="%s"' % (
env.get_bin_path(_PYTHON_FACTORY), self._path)
return command
def get_class(self): def get_class(self):
"""Get the main Activity class""" """Get the main Activity class"""