isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the gnome-shell script work without needing "jhbuild run"

Browse Source
This commit is contained in:
Dan Winship 2009-02-23 16:44:33 -05:00
parent b39bc62171
commit 84aec28575
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -29,6 +29,17 @@ PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)
# it becomes stable. # it becomes stable.
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
META_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix metacity-plugins`/bin
# FIXME: metacity-plugins.pc should point directly to its .gir file
META_LIB_DIR=`$PKG_CONFIG --variable=libdir metacity-plugins`
AC_SUBST(META_BIN_DIR)
AC_SUBST(META_LIB_DIR)
GJS_JS_DIR=`$PKG_CONFIG --variable=jsdir gjs-1.0`
GJS_JS_NATIVE_DIR=`$PKG_CONFIG --variable=jsnativedir gjs-1.0`
AC_SUBST(GJS_JS_DIR)
AC_SUBST(GJS_JS_NATIVE_DIR)
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
AM_PATH_GLIB_2_0() AM_PATH_GLIB_2_0()
G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
@ -63,4 +74,5 @@ AC_OUTPUT([
Makefile Makefile
data/Makefile data/Makefile
src/Makefile src/Makefile
src/gnome-shell
]) ])

5
src/Makefile.am
View File

@ -92,7 +92,7 @@ Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefil
$(G_IR_SCANNER) \ $(G_IR_SCANNER) \
--namespace=Shell \ --namespace=Shell \
--nsversion=0.1 \ --nsversion=0.1 \
--add-include-path=$(libdir)/metacity/ \ --add-include-path=$(META_LIB_DIR)/metacity/ \
--include=Clutter-0.9 \ --include=Clutter-0.9 \
--include=Meta-2.25 \ --include=Meta-2.25 \
--add-include-path=$(builddir) \ --add-include-path=$(builddir) \
@ -146,3 +146,6 @@ CLEANFILES += Big-1.0.gir
Big-1.0.typelib: libbig-1.0.la Big-1.0.gir Big-1.0.typelib: libbig-1.0.la Big-1.0.gir
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Big-1.0.gir -o $@ LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Big-1.0.gir -o $@
CLEANFILES += Big-1.0.typelib CLEANFILES += Big-1.0.typelib
all-local:
chmod a+x gnome-shell

4
src/gnome-shell → src/gnome-shell.in
View File

@ -116,10 +116,10 @@ def start_shell():
# Set up environment # Set up environment
env = dict(os.environ) env = dict(os.environ)
env.update({'GNOME_SHELL_JS' : js_dir, env.update({'GNOME_SHELL_JS' : '@GJS_JS_DIR@:@GJS_JS_NATIVE_DIR@:' + js_dir,
'GNOME_SHELL_DATADIR' : data_dir, 'GNOME_SHELL_DATADIR' : data_dir,
'GI_TYPELIB_PATH' : plugin_dir, 'GI_TYPELIB_PATH' : plugin_dir,
'PATH' : os.environ.get('PATH', '') + ':' + plugin_dir, 'PATH' : '@META_BIN_DIR@:' + os.environ.get('PATH', '') + ':' + plugin_dir,
'LD_LIBRARY_PATH' : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir, 'LD_LIBRARY_PATH' : os.environ.get('LD_LIBRARY_PATH', '') + ':' + plugin_dir,
'GNOME_DISABLE_CRASH_DIALOG' : '1'}) 'GNOME_DISABLE_CRASH_DIALOG' : '1'})