Add a script to start sugar. Move the gtkrc to avoid conflicts when

installing on a complete system.

.gitignore

@@ -55,3 +55,4 @@ lib/src/stamp-sugar-marshal.c
 lib/src/stamp-sugar-marshal.h
 services/clipboard/org.laptop.Clipboard.service
 services/console/org.laptop.sugar.Console.service
+bin/sugar

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = lib po shell sugar services tools
+SUBDIRS = bin data lib po shell sugar services
 
 ACLOCAL_AMFLAGS = -I m4
 

bin/Makefile.am

@@ -0,0 +1,7 @@
+bin_SCRIPTS = 			\
+	sugar			\
+	sugar-install-bundle
+
+EXTRA_DIST =                    \
+	$(bin_SCRIPTS)		\
+	sugar.in

bin/sugar.in

@@ -0,0 +1,2 @@
+export GTK2_RC_FILES=@prefix@/gtkrc
+dbus-launch --exit-with-session sugar-shell

configure.ac

@@ -112,8 +112,12 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 
+AC_CONFIG_FILES([bin/sugar], [chmod +x sugar])
+
 AC_OUTPUT([
 Makefile
+bin/Makefile
+data/Makefile
 lib/Makefile
 lib/data/Makefile
 lib/src/Makefile
@@ -158,6 +162,4 @@ sugar/p2p/Makefile
 sugar/presence/Makefile
 sugar/datastore/Makefile
 po/Makefile.in
-tools/Makefile
-tools/sugar-setup-activity
 ])

data/Makefile.am

@@ -0,0 +1,4 @@
+sugardir = $(pkgdatadir)
+sugar_DATA = gtkrc
+
+EXTRA_DIST = $(sugar_DATA)

data/gtkrc

@@ -0,0 +1,6 @@
+gtk-theme-name = "olpc"
+gtk-icon-theme-name = "olpc"
+gtk-font-name = "Bitstream Vera Sans 7"
+gtk-icon-sizes = "gtk-menu=32,32:gtk-button=32,32"
+gtk-cursor-theme-name = "olpc"
+gtk-cursor-theme-size = 48

sugar-emulator

@@ -90,4 +90,6 @@ else:
 
 _start_xephyr(width, height, min(_sugar.get_screen_dpi(), 96))
 
+os.environ['GTK2_RC_FILES'] = env.get_data_path('gtkrc')
+
 os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)

sugar/env.py

@@ -63,3 +63,6 @@ def get_service_path(name):
 
 def get_shell_path(path=None):
     return _get_prefix_path('share/sugar/shell', path)
+
+def get_data_path(path=None):
+    return _get_prefix_path('share/sugar', path)

tools/Makefile.am

@@ -1,4 +0,0 @@
-bin_SCRIPTS = sugar-install-bundle  \
-              sugar-setup-activity
-
-EXTRA_DIST = $(bin_SCRIPTS)

tools/sugar-setup-activity.in

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-from sugar import setup
-
-if len(sys.argv) > 2:
-	prefix = sys.argv[2]
-else:
-	prefix = '@prefix@'
-
-if len(sys.argv) > 3:
-	root = sys.argv[3]
-else:
-	root = ''
-
-setup.setup_activity(sys.argv[1],
-		     '%s%s/share/sugar/activities' % (root, prefix),
-		     '%s/bin/sugar-activity-factory' % prefix)
-
-print '%s installed.' % sys.argv[1]