summaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2024-11-17 09:34:11 +0100
committerDylan Baker <dylan@pnwbakers.com>2024-12-19 09:25:20 -0800
commitdafa6a7ac14f18e5a2529a2251fc6d552ea37547 (patch)
treec01d13796a386e8a926da2f861068b84507f3bd9 /mesonbuild/scripts
parentef612343d90a79a49b9116e4cf7afb07eaa08ab4 (diff)
downloadmeson-dafa6a7ac14f18e5a2529a2251fc6d552ea37547.tar.gz
scripts: rename run_tool to run_clang_tool
Differentiate from the "run_tool_on_targets" function that will be introduced in the next commit. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/clangformat.py4
-rw-r--r--mesonbuild/scripts/clangtidy.py4
-rw-r--r--mesonbuild/scripts/run_tool.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/scripts/clangformat.py b/mesonbuild/scripts/clangformat.py
index 88cc89071..f0d084f2b 100644
--- a/mesonbuild/scripts/clangformat.py
+++ b/mesonbuild/scripts/clangformat.py
@@ -8,7 +8,7 @@ import subprocess
from pathlib import Path
import sys
-from .run_tool import run_tool
+from .run_tool import run_clang_tool
from ..environment import detect_clangformat
from ..mesonlib import version_compare
from ..programs import ExternalProgram
@@ -57,4 +57,4 @@ def run(args: T.List[str]) -> int:
else:
cformat_ver = None
- return run_tool('clang-format', srcdir, builddir, run_clang_format, exelist, options, cformat_ver)
+ return run_clang_tool('clang-format', srcdir, builddir, run_clang_format, exelist, options, cformat_ver)
diff --git a/mesonbuild/scripts/clangtidy.py b/mesonbuild/scripts/clangtidy.py
index fe34801e0..ab53bbd39 100644
--- a/mesonbuild/scripts/clangtidy.py
+++ b/mesonbuild/scripts/clangtidy.py
@@ -11,7 +11,7 @@ import os
import shutil
import sys
-from .run_tool import run_tool
+from .run_tool import run_clang_tool
from ..environment import detect_clangtidy, detect_clangapply
import typing as T
@@ -56,7 +56,7 @@ def run(args: T.List[str]) -> int:
fixesdir.unlink()
fixesdir.mkdir(parents=True)
- tidyret = run_tool('clang-tidy', srcdir, builddir, run_clang_tidy, tidyexe, builddir, fixesdir)
+ tidyret = run_clang_tool('clang-tidy', srcdir, builddir, run_clang_tidy, tidyexe, builddir, fixesdir)
if fixesdir is not None:
print('Applying fix-its...')
applyret = subprocess.run(applyexe + ['-format', '-style=file', '-ignore-insert-conflict', fixesdir]).returncode
diff --git a/mesonbuild/scripts/run_tool.py b/mesonbuild/scripts/run_tool.py
index a84de15b1..2cccb1b33 100644
--- a/mesonbuild/scripts/run_tool.py
+++ b/mesonbuild/scripts/run_tool.py
@@ -27,7 +27,7 @@ def parse_pattern_file(fname: Path) -> T.List[str]:
pass
return patterns
-def run_tool(name: str, srcdir: Path, builddir: Path, fn: T.Callable[..., subprocess.CompletedProcess], *args: T.Any) -> int:
+def run_clang_tool(name: str, srcdir: Path, builddir: Path, fn: T.Callable[..., subprocess.CompletedProcess], *args: T.Any) -> int:
patterns = parse_pattern_file(srcdir / f'.{name}-include')
globs: T.Union[T.List[T.List[Path]], T.List[T.Generator[Path, None, None]]]
if patterns: