diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-17 08:25:47 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-17 08:25:47 (GMT) |
commit | ec3094e08b84f98228dd981e19042470815e30ef (patch) | |
tree | 2f8d552b616d83919ee2bb5f3f56328a15441302 | |
parent | 9ca5c6c0bf8e5679235373620ed455edebb338f4 (diff) |
Move the running from source dir hacks in the emulator.
-rwxr-xr-x | sugar-emulator | 22 | ||||
-rw-r--r-- | sugar/env.py | 20 |
2 files changed, 21 insertions, 21 deletions
diff --git a/sugar-emulator b/sugar-emulator index b59d258..dafc275 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -25,10 +25,30 @@ if os.path.isfile(os.path.join(sourcedir, 'sugar/__uninstalled__.py')): sys.path.insert(0, sourcedir) else: print 'Running the installed sugar...' + sourcedir = None from sugar import env +from sugar import setup -env.setup_system() +if sourcedir: + bin_path = sourcedir + bin_path += ';' + os.path.join(sourcedir, 'shell') + bin_path += ';' + os.path.join(sourcedir, 'services/presence') + + if os.environ.has_key('PATH'): + old_path = os.environ['PATH'] + os.environ['PATH'] = bin_path + ':' + old_path + else: + os.environ['PATH'] = bin_path + + source = os.path.join(sourcedir, 'activities') + runner = os.path.join(sourcedir, 'shell/sugar-activity-factory') + setup.setup_activities(source, env.get_activity_info_dir(), runner) + + bin = os.path.join(sourcedir, + 'services/presence/sugar-presence-service') + setup.write_service('org.laptop.Presence', bin, + env.get_activity_info_dir()) from sugar.emulator import Emulator diff --git a/sugar/env.py b/sugar/env.py index e70fcba..65081fc 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -24,26 +24,6 @@ try: except ImportError: from sugar.__installed__ import * -import sugar.setup - -def setup_system(): - for path in sugar_bin_path: - if os.environ.has_key('PATH'): - old_path = os.environ['PATH'] - os.environ['PATH'] = path + ':' + old_path - else: - os.environ['PATH'] = path - - 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, 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, - get_activity_info_dir()) - def get_profile_path(): if os.environ.has_key('SUGAR_PROFILE'): profile_id = os.environ['SUGAR_PROFILE'] |