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

Print default option values that don't match the current value

This commit is contained in:
Niklas Claesson 2018-06-13 21:51:32 +02:00 committed by Jussi Pakkanen
parent 7140afc0a8
commit 9620755ff7
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mesonbuild/interpreter.py
View File

@ -1855,6 +1855,7 @@ class Interpreter(InterpreterBase):
self.default_project_options = default_project_options.copy() self.default_project_options = default_project_options.copy()
else: else:
self.default_project_options = {} self.default_project_options = {}
self.project_default_options = {}
self.build_func_dict() self.build_func_dict()
# build_def_files needs to be defined before parse_project is called # build_def_files needs to be defined before parse_project is called
self.build_def_files = [os.path.join(self.subdir, environment.build_filename)] self.build_def_files = [os.path.join(self.subdir, environment.build_filename)]
@ -1874,6 +1875,18 @@ class Interpreter(InterpreterBase):
else: else:
self.builtin['target_machine'] = self.builtin['host_machine'] self.builtin['target_machine'] = self.builtin['host_machine']
def get_non_matching_default_options(self):
env = self.environment
for def_opt_name, def_opt_value in self.project_default_options.items():
for option_type in [
env.coredata.builtins, env.coredata.compiler_options,
env.coredata.backend_options, env.coredata.base_options,
env.coredata.user_options]:
for cur_opt_name, cur_opt_value in option_type.items():
if (def_opt_name == cur_opt_name and
def_opt_value != cur_opt_value.value):
yield (def_opt_name, def_opt_value, cur_opt_value.value)
def build_func_dict(self): def build_func_dict(self):
self.funcs.update({'add_global_arguments': self.func_add_global_arguments, self.funcs.update({'add_global_arguments': self.func_add_global_arguments,
'add_project_arguments': self.func_add_project_arguments, 'add_project_arguments': self.func_add_project_arguments,
@ -2377,9 +2390,10 @@ external dependencies (including libraries) must go to "dependencies".''')
# values previously set from command line. That means that changing # values previously set from command line. That means that changing
# default_options in a project will trigger a reconfigure but won't # default_options in a project will trigger a reconfigure but won't
# have any effect. # have any effect.
self.project_default_options = mesonlib.stringlistify(kwargs.get('default_options', []))
self.project_default_options = coredata.create_options_dict(self.project_default_options)
if self.environment.first_invocation: if self.environment.first_invocation:
default_options = mesonlib.stringlistify(kwargs.get('default_options', [])) default_options = self.project_default_options
default_options = coredata.create_options_dict(default_options)
default_options.update(self.default_project_options) default_options.update(self.default_project_options)
else: else:
default_options = {} default_options = {}

5
mesonbuild/mesonmain.py
View File

@ -141,6 +141,11 @@ class MesonApp:
profile.runctx('intr.run()', globals(), locals(), filename=fname) profile.runctx('intr.run()', globals(), locals(), filename=fname)
else: else:
intr.run() intr.run()
# Print all default option values that don't match the current value
for def_opt_name, def_opt_value, cur_opt_value in intr.get_non_matching_default_options():
mlog.log('Option', mlog.bold(def_opt_name), 'is:',
mlog.bold(str(cur_opt_value)),
'[default: {}]'.format(str(def_opt_value)))
try: try:
dumpfile = os.path.join(env.get_scratch_dir(), 'build.dat') dumpfile = os.path.join(env.get_scratch_dir(), 'build.dat')
# We would like to write coredata as late as possible since we use the existence of # We would like to write coredata as late as possible since we use the existence of