diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-17 08:07:35 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-17 08:07:35 (GMT) |
| commit | 77f2de8f737d816391a9447e7b4e1ef77be92a6d (patch) | |
| tree | 2acb31b4a77d0348f88c800cd950a6c69f8e3b86 /sugar | |
| parent | 4b7b1586d2783d9d3dad999b6e9c7e647136c2af (diff) | |
Let activities extend their own path
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/__installed__.py.in | 1 | ||||
| -rw-r--r-- | sugar/__uninstalled__.py.in | 2 | ||||
| -rw-r--r-- | sugar/env.py | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index d9cdfd5..3378d89 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -1,6 +1,7 @@ sugar_source_dir = None sugar_data_dir = '@prefix@/share/sugar' sugar_activities_dir = '@prefix@/share/sugar/activities' +sugar_activity_info_dir = '@prefix@/share/sugar/activities' sugar_services_dir = '@prefix@/share/sugar/services' sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf' diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in index b63af66..4170d57 100644 --- a/sugar/__uninstalled__.py.in +++ b/sugar/__uninstalled__.py.in @@ -6,7 +6,7 @@ sugar_data_dir = os.path.join(sugar_source_dir, 'shell/data') sugar_services_dir = os.path.join(sugar_source_dir, 'services') __tmpdir = os.path.join(tempfile.gettempdir(), 'sugar') -sugar_activities_dir = __tmpdir +sugar_activity_info_dir = __tmpdir sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf') diff --git a/sugar/env.py b/sugar/env.py index bd7a919..8fe2a75 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -47,12 +47,12 @@ def setup_system(): if sugar_source_dir: source = os.path.join(sugar_source_dir, 'activities') runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory') - sugar.setup.setup_activities(source, sugar_activities_dir, runner) + sugar.setup.setup_activities(source, get_activity_info_dir(), runner) bin = os.path.join(sugar_source_dir, 'services/presence/sugar-presence-service') sugar.setup.write_service('org.laptop.Presence', bin, - sugar_activities_dir) + get_activity_info_dir()) def get_profile_path(): if os.environ.has_key('SUGAR_PROFILE'): @@ -75,6 +75,9 @@ def get_data_dir(): def get_activities_dir(): return sugar_activities_dir +def get_activity_info_dir(): + return sugar_activity_info_dir + def get_services_dir(): return sugar_services_dir |