diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-10-07 18:22:06 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-10-29 18:59:30 +0200 |
| commit | 795e7431ffafa0cc1257d64c5fdd0f2c3cb6d841 (patch) | |
| tree | 40ff7c80d4ae38cb1b144824a284e0115368e7c0 /mesonbuild/scripts | |
| parent | 1614401329f11d3763a56ed5ce207aba511a6a9d (diff) | |
| download | meson-795e7431ffafa0cc1257d64c5fdd0f2c3cb6d841.tar.gz | |
environment: move tool detection functions to a new module
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/clangformat.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/clangtidy.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/coverage.py | 6 | ||||
| -rw-r--r-- | mesonbuild/scripts/scanbuild.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/scripts/clangformat.py b/mesonbuild/scripts/clangformat.py index a3c19e9ad..281cb10ca 100644 --- a/mesonbuild/scripts/clangformat.py +++ b/mesonbuild/scripts/clangformat.py @@ -8,7 +8,7 @@ from pathlib import Path import sys from .run_tool import run_clang_tool, run_with_buffered_output -from ..environment import detect_clangformat +from ..tooldetect import detect_clangformat from ..mesonlib import version_compare from ..programs import ExternalProgram import typing as T diff --git a/mesonbuild/scripts/clangtidy.py b/mesonbuild/scripts/clangtidy.py index e5f702491..da4d45474 100644 --- a/mesonbuild/scripts/clangtidy.py +++ b/mesonbuild/scripts/clangtidy.py @@ -12,7 +12,7 @@ import shutil import sys from .run_tool import run_with_buffered_output, run_clang_tool_on_sources -from ..environment import detect_clangtidy, detect_clangapply +from ..tooldetect import detect_clangtidy, detect_clangapply import typing as T async def run_clang_tidy(fname: Path, tidyexe: list, builddir: Path, fixesdir: T.Optional[Path]) -> int: diff --git a/mesonbuild/scripts/coverage.py b/mesonbuild/scripts/coverage.py index a4dfebfb9..f51536358 100644 --- a/mesonbuild/scripts/coverage.py +++ b/mesonbuild/scripts/coverage.py @@ -3,7 +3,7 @@ from __future__ import annotations -from mesonbuild import environment, mesonlib +from mesonbuild import tooldetect, mesonlib import argparse, re, sys, os, subprocess, pathlib, stat, shutil import typing as T @@ -16,11 +16,11 @@ def coverage(outputs: T.List[str], source_root: str, subproject_root: str, build if gcovr_exe == '': gcovr_exe = None else: - gcovr_exe, gcovr_version = environment.detect_gcovr(gcovr_exe) + gcovr_exe, gcovr_version = tooldetect.detect_gcovr(gcovr_exe) if llvm_cov_exe == '' or shutil.which(llvm_cov_exe) is None: llvm_cov_exe = None - lcov_exe, lcov_version, genhtml_exe = environment.detect_lcov_genhtml() + lcov_exe, lcov_version, genhtml_exe = tooldetect.detect_lcov_genhtml() # load config files for tools if available in the source tree # - lcov requires manually specifying a per-project config diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py index 20ce0a621..3bf791833 100644 --- a/mesonbuild/scripts/scanbuild.py +++ b/mesonbuild/scripts/scanbuild.py @@ -7,7 +7,7 @@ import subprocess import shutil import tempfile from ..cmdline import get_cmd_line_file, CmdLineFileParser -from ..environment import detect_ninja, detect_scanbuild +from ..tooldetect import detect_ninja, detect_scanbuild from ..mesonlib import windows_proof_rmtree, determine_worker_count from pathlib import Path import typing as T |