FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

glib2: consider destdir when compiling schemas 

When a destdir is set, the schemas are now not only installed below it,
but also compiled there.
This commit is contained in:
XZS 2016-12-14 21:34:21 +01:00 committed by ita1024
parent ec3bf9d046
commit f0c5c732a7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
waflib/Tools/glib2.py
View File

@ -303,8 +303,13 @@ def process_settings(self):
def compile_schemas_callback(bld):
if not bld.is_install: return
Logs.pprint ('YELLOW','Updating GSettings schema cache')
command = Utils.subst_vars("${GLIB_COMPILE_SCHEMAS} ${GSETTINGSSCHEMADIR}", bld.env)
self.bld.exec_command(command)
env = bld.env
destdir = Options.options.destdir
if destdir:
path = os.path.join(destdir, env.GSETTINGSSCHEMADIR.lstrip(os.sep))
else:
path = env.GSETTINGSSCHEMADIR
self.bld.exec_command("%s %s" % (env.get_flat('GLIB_COMPILE_SCHEMAS'), path))
if self.bld.is_install:
if not self.env.GSETTINGSSCHEMADIR: