Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix mesonintrospect.

This commit is contained in:
Jussi Pakkanen 2016-03-17 21:08:07 +02:00
parent 19046fd854
commit de03ae5af0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mesonbuild/mintro.py
View File

@ -89,28 +89,29 @@ def list_target_files(target_name, coredata, builddata):
def list_buildoptions(coredata, builddata):
buildtype= {'choices': ['plain', 'debug', 'debugoptimized', 'release'],
'type' : 'combo',
'value' : coredata.buildtype,
'value' : coredata.builtin_options['buildtype'].value,
'description' : 'Build type',
'name' : 'type'}
strip = {'value' : coredata.strip,
strip = {'value' : coredata.builtin_options['strip'].value,
'type' : 'boolean',
'description' : 'Strip on install',
'name' : 'strip'}
coverage = {'value': coredata.coverage,
coverage = {'value': coredata.builtin_options['coverage'].value,
'type' : 'boolean',
'description' : 'Enable coverage',
'name' : 'coverage'}
pch = {'value' : coredata.use_pch,
pch = {'value' : coredata.builtin_options['use_pch'].value,
'type' : 'boolean',
'description' : 'Use precompiled headers',
'name' : 'pch'}
unity = {'value' : coredata.unity,
unity = {'value' : coredata.builtin_options['unity'].value,
'type' : 'boolean',
'description' : 'Unity build',
'name' : 'unity'}
optlist = [buildtype, strip, coverage, pch, unity]
add_keys(optlist, coredata.user_options)
add_keys(optlist, coredata.compiler_options)
add_keys(optlist, coredata.base_options)
print(json.dumps(optlist))
def add_keys(optlist, options):
@ -121,14 +122,14 @@ def add_keys(optlist, options):
optdict = {}
optdict['name'] = key
optdict['value'] = opt.value
if isinstance(opt, mesonlib.UserStringOption):
if isinstance(opt, coredata.UserStringOption):
typestr = 'string'
elif isinstance(opt, mesonlib.UserBooleanOption):
elif isinstance(opt, coredata.UserBooleanOption):
typestr = 'boolean'
elif isinstance(opt, mesonlib.UserComboOption):
elif isinstance(opt, coredata.UserComboOption):
optdict['choices'] = opt.choices
typestr = 'combo'
elif isinstance(opt, mesonlib.UserStringArrayOption):
elif isinstance(opt, coredata.UserStringArrayOption):
typestr = 'stringarray'
else:
raise RuntimeError("Unknown option type")