diff options
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/LogWriter.py (renamed from sugar/session/LogWriter.py) | 0 | ||||
| -rw-r--r-- | sugar/Makefile.am | 8 | ||||
| -rw-r--r-- | sugar/__installed__.py.in | 5 | ||||
| -rw-r--r-- | sugar/__uninstalled__.py | 5 | ||||
| -rw-r--r-- | sugar/activity/Activity.py (renamed from sugar/activity/activity.py) | 0 | ||||
| -rw-r--r-- | sugar/chat/Makefile.am | 3 | ||||
| -rw-r--r-- | sugar/env.py | 27 | ||||
| -rw-r--r-- | sugar/session/__init__.py | 0 |
8 files changed, 23 insertions, 25 deletions
diff --git a/sugar/session/LogWriter.py b/sugar/LogWriter.py index a04d14b..a04d14b 100644 --- a/sugar/session/LogWriter.py +++ b/sugar/LogWriter.py diff --git a/sugar/Makefile.am b/sugar/Makefile.am index eb28f89..5fe8ee7 100644 --- a/sugar/Makefile.am +++ b/sugar/Makefile.am @@ -1,12 +1,12 @@ -SUBDIRS = chat browser p2p shell session presence - -bin_SCRIPTS = sugar +SUBDIRS = activity chat p2p presence sugardir = $(pythondir)/sugar sugar_PYTHON = \ __init__.py \ __installed__.py \ + bots.py \ env.py \ - util.py + util.py \ + LogWriter.py EXTRA_DIST = sugar __uninstalled__.py diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index fd39247..1b3a64b 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -1,3 +1,2 @@ -data_basedir = '@prefix@/share/' -data_dirs = [ 'sugar' ] -activities_dir = 'activities' +sugar_data_dir = '@prefix@/share/sugar' +sugar_activities_dir = '@prefix@/share/sugar/activities' diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py index 286a735..6b2e1dd 100644 --- a/sugar/__uninstalled__.py +++ b/sugar/__uninstalled__.py @@ -1,5 +1,4 @@ import os -data_basedir = os.path.dirname(os.path.dirname(__file__)) -data_dirs = [ 'activities/browser' ] -activities_dir = '' +sugar_data_dir = os.path.dirname(os.path.dirname(__file__)) +sugar_activities_dir = os.path.join(sugar_data_dir, 'activities') diff --git a/sugar/activity/activity.py b/sugar/activity/Activity.py index 509565c..509565c 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/Activity.py diff --git a/sugar/chat/Makefile.am b/sugar/chat/Makefile.am index 0d9eaae..b3ab5eb 100644 --- a/sugar/chat/Makefile.am +++ b/sugar/chat/Makefile.am @@ -4,6 +4,9 @@ sugardir = $(pythondir)/sugar/chat sugar_PYTHON = \ __init__.py \ Chat.py \ + ChatEditor.py \ + ChatToolbar.py \ + ChatWindow.py \ Emoticons.py \ GroupChat.py \ richtext.py diff --git a/sugar/env.py b/sugar/env.py index 1135791..df1fb30 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -1,10 +1,18 @@ import os +import sys try: from sugar.__uninstalled__ import * except ImportError: from sugar.__installed__ import * +def add_to_python_path(path): + sys.path.insert(0, path) + if os.environ.has_key('PYTHONPATH'): + os.environ['PYTHONPATH'] += ':' + path + else: + os.environ['PYTHONPATH'] = path + def get_user_dir(): if os.environ.has_key('SUGAR_USER_DIR'): return os.environ['SUGAR_USER_DIR'] @@ -22,20 +30,9 @@ def get_nick_name(): return os.environ['SUGAR_NICK_NAME'] else: return None - -def get_data_file(filename): - for data_dir in get_data_dirs(): - path = os.path.join(data_dir, filename) - if os.path.isfile(path): - return path - return None -def get_data_dirs(): - dirs = [] - for data_dir in data_dirs: - path = os.path.join(data_basedir, data_dir) - dirs.append(path) - return dirs - +def get_data_dir(): + return sugar_data_dir + def get_activities_dir(): - return activities_dir + return sugar_activities_dir diff --git a/sugar/session/__init__.py b/sugar/session/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/sugar/session/__init__.py +++ /dev/null |