diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-17 17:26:21 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-17 17:26:21 +0530 |
| commit | e307865596274094b582ce851bcd48092d5f6a03 (patch) | |
| tree | d51f02143502f6f7fbb75038804fe8c816f8d88b /mesonbuild/environment.py | |
| parent | b5a79b491efc54848d31f4d230fedca38dd4b846 (diff) | |
| download | meson-e307865596274094b582ce851bcd48092d5f6a03.zip meson-e307865596274094b582ce851bcd48092d5f6a03.tar.gz meson-e307865596274094b582ce851bcd48092d5f6a03.tar.bz2 | |
ninja backend: Detect ninja only once and log it
Needed for the CI, but good to have in general too.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index b0002a0..b3d72e6 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -89,16 +89,19 @@ def find_coverage_tools(): genhtml_exe = None return gcovr_exe, lcov_exe, genhtml_exe -def detect_ninja(version='1.5'): +def detect_ninja(version='1.5', log=False): for n in ['ninja', 'ninja-build']: try: p, found = Popen_safe([n, '--version'])[0:2] except (FileNotFoundError, PermissionError): # Doesn't exist in PATH or isn't executable continue + found = found.strip() # Perhaps we should add a way for the caller to know the failure mode # (not found or too old) if p.returncode == 0 and mesonlib.version_compare(found, '>=' + version): + if log: + mlog.log('Found ninja-{} at {}'.format(found, shlex.quote(shutil.which(n)))) return n def detect_native_windows_arch(): |