From 5d51bc79c7555e681a0c638da9528458257744ae Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 11 Nov 2017 01:53:23 +0200 Subject: Replaced sys.executable use with the mesonlib equivalent. --- mesonbuild/scripts/regen_checker.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'mesonbuild/scripts') diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py index 53c5428..e8fbd19 100644 --- a/mesonbuild/scripts/regen_checker.py +++ b/mesonbuild/scripts/regen_checker.py @@ -32,15 +32,11 @@ def need_regen(regeninfo, regen_timestamp): return False def regen(regeninfo, mesonscript, backend): - if sys.executable.lower().endswith('meson.exe'): - cmd_exe = [sys.executable] - else: - cmd_exe = [sys.executable, mesonscript] - cmd = cmd_exe + ['--internal', - 'regenerate', - regeninfo.build_dir, - regeninfo.source_dir, - '--backend=' + backend] + cmd = mesonlib.meson_command + ['--internal', + 'regenerate', + regeninfo.build_dir, + regeninfo.source_dir, + '--backend=' + backend] subprocess.check_call(cmd) def run(args): -- cgit v1.1 From 22adda16179e11dd7e5ca34a34e6286afcf6c0c9 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 20 Nov 2017 23:38:26 +0200 Subject: Review fixes. --- mesonbuild/scripts/regen_checker.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mesonbuild/scripts') diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py index e8fbd19..a9b00c7 100644 --- a/mesonbuild/scripts/regen_checker.py +++ b/mesonbuild/scripts/regen_checker.py @@ -14,6 +14,7 @@ import sys, os import pickle, subprocess +from mesonbuild.mesonlib import meson_command # This could also be used for XCode. @@ -32,11 +33,11 @@ def need_regen(regeninfo, regen_timestamp): return False def regen(regeninfo, mesonscript, backend): - cmd = mesonlib.meson_command + ['--internal', - 'regenerate', - regeninfo.build_dir, - regeninfo.source_dir, - '--backend=' + backend] + cmd = meson_command + ['--internal', + 'regenerate', + regeninfo.build_dir, + regeninfo.source_dir, + '--backend=' + backend] subprocess.check_call(cmd) def run(args): -- cgit v1.1