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

Lots of build fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activities/browser/Makefile.am
View File

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

1
configure.ac
View File

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

9
shell/Makefile.am
View File

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

13
shell/sugar
View File

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

1
sugar/Makefile.am
View File

@ -6,6 +6,7 @@ sugar_PYTHON = \
__installed__.py \ __installed__.py \
bots.py \ bots.py \
env.py \ env.py \
keybindings.py \
util.py \ util.py \
LogWriter.py LogWriter.py

1
sugar/chat/Makefile.am
View File

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