diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | bin/Makefile.am | 7 | ||||
| -rwxr-xr-x | bin/sugar-install-bundle (renamed from tools/sugar-install-bundle) | 0 | ||||
| -rw-r--r-- | bin/sugar.in | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/gtkrc | 6 | ||||
| -rwxr-xr-x | sugar-emulator | 2 | ||||
| -rw-r--r-- | sugar/env.py | 3 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/sugar-setup-activity.in | 20 |
12 files changed, 30 insertions, 27 deletions
@@ -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 diff --git a/Makefile.am b/Makefile.am index 4606e90..2502ee2 100644 --- a/Makefile.am +++ b/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 diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 0000000..31f8a3b --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,7 @@ +bin_SCRIPTS = \ + sugar \ + sugar-install-bundle + +EXTRA_DIST = \ + $(bin_SCRIPTS) \ + sugar.in diff --git a/tools/sugar-install-bundle b/bin/sugar-install-bundle index 359c1c0..359c1c0 100755 --- a/tools/sugar-install-bundle +++ b/bin/sugar-install-bundle diff --git a/bin/sugar.in b/bin/sugar.in new file mode 100644 index 0000000..2fec22a --- /dev/null +++ b/bin/sugar.in @@ -0,0 +1,2 @@ +export GTK2_RC_FILES=@prefix@/gtkrc +dbus-launch --exit-with-session sugar-shell diff --git a/configure.ac b/configure.ac index abc04f7..81b760f 100644 --- a/configure.ac +++ b/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 ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..f03c96c --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,4 @@ +sugardir = $(pkgdatadir) +sugar_DATA = gtkrc + +EXTRA_DIST = $(sugar_DATA) diff --git a/data/gtkrc b/data/gtkrc new file mode 100644 index 0000000..cc0d2ca --- /dev/null +++ b/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 diff --git a/sugar-emulator b/sugar-emulator index 76fccdb..8806162 100755 --- a/sugar-emulator +++ b/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) diff --git a/sugar/env.py b/sugar/env.py index 2acdcb9..ed4e72d 100644 --- a/sugar/env.py +++ b/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) diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index d534e0f..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -bin_SCRIPTS = sugar-install-bundle \ - sugar-setup-activity - -EXTRA_DIST = $(bin_SCRIPTS) diff --git a/tools/sugar-setup-activity.in b/tools/sugar-setup-activity.in deleted file mode 100644 index 5459853..0000000 --- a/tools/sugar-setup-activity.in +++ /dev/null @@ -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] |