diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/mesonmain.py | 10 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 91a52b1..e7005e9 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -81,14 +81,18 @@ class CommandLineParser: self.commands[i] = p def add_runpython_arguments(self, parser): + parser.add_argument('-c', action='store_true', dest='eval_arg', default=False) parser.add_argument('script_file') parser.add_argument('script_args', nargs=argparse.REMAINDER) def run_runpython_command(self, options): import runpy - sys.argv[1:] = options.script_args - sys.path.insert(0, os.path.dirname(options.script_file)) - runpy.run_path(options.script_file, run_name='__main__') + if options.eval_arg: + exec(options.script_file) + else: + sys.argv[1:] = options.script_args + sys.path.insert(0, os.path.dirname(options.script_file)) + runpy.run_path(options.script_file, run_name='__main__') return 0 def add_help_arguments(self, parser): diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index bd69244..a0ebe0e 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -42,9 +42,8 @@ mod_kwargs -= set(['name_prefix', 'name_suffix']) def run_command(python, command): - _, stdout, _ = mesonlib.Popen_safe(python.get_command() + [ - '-c', - command]) + cmd = python.get_command() + ['-c', command] + _, stdout, _ = mesonlib.Popen_safe(cmd) return stdout.strip() @@ -265,8 +264,7 @@ class PythonDependency(ExternalDependency): return super().get_pkgconfig_variable(variable_name, kwargs) -INTROSPECT_COMMAND = ''' -import sysconfig +INTROSPECT_COMMAND = '''import sysconfig import json import sys |