Lots of build fixes

This commit is contained in:
Marco Pesenti Gritti 2006-07-10 16:16:30 +02:00
parent 3e30af13f6
commit 01da885516
6 changed files with 20 additions and 23 deletions

View File

@ -1,9 +1,7 @@
sugardir = $(pkgdatadir)/activities/browser
sugar_PYTHON = \
__init__.py \
browser.py \
NotificationBar.py \
BrowserShell.py \
AddressItem.py \
BrowserActivity.py \
NavigationToolbar.py

View File

@ -27,7 +27,6 @@ activities/Makefile
activities/browser/Makefile
activities/chat/Makefile
shell/Makefile
shell/google/Makefile
shell/session/Makefile
sugar/Makefile
sugar/__installed__.py

View File

@ -1,14 +1,15 @@
SUBDIRS = google session
SUBDIRS = session
bin_SCRIPTS = sugar
sugardir = $(pkgdatadir)/shell
sugar_PYTHON = \
__init__.py \
shell.py \
Owner.py \
PresenceWindow.py \
StartPage.py \
WindowManager.py
sugar_PYTHON = \
__init__.py \
ActivityRegistry.py \
ConsoleLogger.py \
Owner.py \
HomeWindow.py \
PresenceWindow.py \
Shell.py
EXTRA_DIST = sugar

View File

@ -5,8 +5,6 @@ import os
import pwd
import random
import pygtk
pygtk.require('2.0')
import gobject
# FIXME How to pick a good display number
@ -15,7 +13,8 @@ XEPHYR_DISPLAY = 100
def add_to_python_path(path):
sys.path.insert(0, path)
if os.environ.has_key('PYTHONPATH'):
os.environ['PYTHONPATH'] += ':' + path
old_path = os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = path + ':' + old_path
else:
os.environ['PYTHONPATH'] = path
@ -52,6 +51,10 @@ def start_matchbox():
def stop_matchbox():
os.kill(xephyr_pid)
start_xephyr()
os.environ['DISPLAY'] = ":%d" % (XEPHYR_DISPLAY)
start_matchbox()
i = 0
dbus_daemon_pid = None
@ -83,10 +86,6 @@ else:
import sugar.env
add_to_python_path(os.path.join(sugar.env.get_data_dir(), 'shell'))
print 'Running the installed sugar...'
start_xephyr()
os.environ['DISPLAY'] = ":%d" % (XEPHYR_DISPLAY)
start_matchbox()
print 'Redirecting output to the console, press Ctrl+Down to open it.'

View File

@ -2,11 +2,12 @@ SUBDIRS = activity chat p2p presence
sugardir = $(pythondir)/sugar
sugar_PYTHON = \
__init__.py \
__init__.py \
__installed__.py \
bots.py \
env.py \
util.py \
bots.py \
env.py \
keybindings.py \
util.py \
LogWriter.py
EXTRA_DIST = __uninstalled__.py

View File

@ -8,7 +8,6 @@ sugar_PYTHON = \
Chat.py \
ChatEditor.py \
ChatToolbar.py \
ChatWindow.py \
Emoticons.py \
GroupChat.py \
MeshChat.py \