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

jhbuild wrapper: Clean up environment variable logic

Browse Source 
Lots of things here were unused. First, we don't need to calculate
the js_dir when not running from the source tree, which makes the
branch mostly empty, meaning we can merge the two branches.
This commit is contained in:
Jasper St. Pierre 2012-04-26 16:28:16 -04:00
parent ccf95b738d
commit 64aa729edd
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gnome-shell-jhbuild.in
View File

@ -64,26 +64,22 @@ def get_running_session_environs():
def start_shell(): def start_shell():
self_dir = os.path.dirname(os.path.abspath(sys.argv[0])) self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
if os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')): running_from_source_tree = os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in'))
running_from_source_tree = True
top_dir = os.path.dirname(self_dir)
js_dir = os.path.join(top_dir, "js")
data_dir = os.path.join(top_dir, "data")
typelib_dir = os.path.join(top_dir, "src")
if 'GI_TYPELIB_PATH' in os.environ:
typelib_dir += ':%s' % (os.environ['GI_TYPELIB_PATH'],)
else:
running_from_source_tree = False
js_dir = os.path.join('@pkgdatadir@', 'js')
# Set up environment # Set up environment
env = dict(os.environ) env = dict(os.environ)
if running_from_source_tree: if running_from_source_tree:
env.update({'GNOME_SHELL_JS' : js_dir, top_dir = os.path.dirname(self_dir)
typelib_dir = os.path.join(top_dir, "src")
if 'GI_TYPELIB_PATH' in os.environ:
typelib_dir += ':%s' % (os.environ['GI_TYPELIB_PATH'],)
env.update({'GNOME_SHELL_JS' : os.path.join(top_dir, "js"),
'GNOME_SHELL_BINDIR' : self_dir, 'GNOME_SHELL_BINDIR' : self_dir,
'GI_TYPELIB_PATH' : typelib_dir, 'GI_TYPELIB_PATH' : typelib_dir,
'GNOME_SHELL_DATADIR' : data_dir, 'GNOME_SHELL_DATADIR' : os.path.join(top_dir, "data"),
'GSETTINGS_SCHEMA_DIR' : data_dir }) 'GSETTINGS_SCHEMA_DIR' : os.path.join(top_dir, "data") })
args = [] args = []
if options.debug: if options.debug: