From 67d3d512ffae9de255c6954451c59816ae8faea9 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 3 Feb 2017 15:53:20 +0530 Subject: mesonintrospect: Also print builtins for --buildoptions This is needed to be able to introspect the value of xxxdir options such as libdir and prefix. --- mesonbuild/mintro.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'mesonbuild/mintro.py') diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index e30500f..2807230 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -111,23 +111,11 @@ def list_target_files(target_name, coredata, builddata): print(json.dumps(sources)) def list_buildoptions(coredata, builddata): - buildtype = {'choices': ['plain', 'debug', 'debugoptimized', 'release', 'minsize'], - 'type': 'combo', - 'value': coredata.get_builtin_option('buildtype'), - 'description': 'Build type', - 'name': 'type'} - strip = {'value': coredata.get_builtin_option('strip'), - 'type': 'boolean', - 'description': 'Strip on install', - 'name': 'strip'} - unity = {'value': coredata.get_builtin_option('unity'), - 'type': 'boolean', - 'description': 'Unity build', - 'name': 'unity'} - optlist = [buildtype, strip, unity] + optlist = [] add_keys(optlist, coredata.user_options) add_keys(optlist, coredata.compiler_options) add_keys(optlist, coredata.base_options) + add_keys(optlist, coredata.builtins) print(json.dumps(optlist)) def add_keys(optlist, options): -- cgit v1.1