aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-11-24 09:28:00 -0500
committerEli Schwartz <eschwartz93@gmail.com>2022-11-24 15:17:23 -0500
commite85138fcc8373f925709124f8586a6feecf968d1 (patch)
treeb5051f163c9f3e2bf9e8e752e6d0a8c6e071a936 /mesonbuild
parent9d1b59fa7ff1a1a31599a04a02c48c6b41026c2c (diff)
downloadmeson-e85138fcc8373f925709124f8586a6feecf968d1.zip
meson-e85138fcc8373f925709124f8586a6feecf968d1.tar.gz
meson-e85138fcc8373f925709124f8586a6feecf968d1.tar.bz2
Fix various spelling errors
Found with codespell.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/backends.py2
-rw-r--r--mesonbuild/build.py6
-rw-r--r--mesonbuild/environment.py2
-rw-r--r--mesonbuild/interpreter/interpreter.py2
-rw-r--r--mesonbuild/interpreter/interpreterobjects.py2
-rw-r--r--mesonbuild/interpreter/kwargs.py2
-rw-r--r--mesonbuild/linkers/detect.py2
-rw-r--r--mesonbuild/linkers/linkers.py2
8 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index fa635f4..bc356b3 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -1562,7 +1562,7 @@ class Backend:
raise MesonException(m.format(t.name, num_out, t.get_outputs(), num_outdirs))
assert len(t.install_tag) == num_out
install_mode = t.get_custom_install_mode()
- # because mypy get's confused type narrowing in lists
+ # because mypy gets confused type narrowing in lists
first_outdir = outdirs[0]
first_outdir_name = install_dir_names[0]
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index c27a77e..a0d0082 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -388,7 +388,7 @@ class IncludeDirs(HoldableObject):
"""Convert IncludeDirs object to a list of strings.
:param sourcedir: The absolute source directory
- :param builddir: The absolute build directory, option, buid dir will not
+ :param builddir: The absolute build directory, option, build dir will not
be added if this is unset
:returns: A list of strings (without compiler argument)
"""
@@ -2562,7 +2562,7 @@ class CustomTarget(Target, CommandBase):
def is_internal(self) -> bool:
'''
- Returns True iif this is a not installed static library.
+ Returns True if this is a not installed static library.
'''
if len(self.outputs) != 1:
return False
@@ -2805,7 +2805,7 @@ class CustomTargetIndex(HoldableObject):
def is_internal(self) -> bool:
'''
- Returns True iif this is a not installed static library
+ Returns True if this is a not installed static library
'''
suf = os.path.splitext(self.output)[-1]
return suf in {'.a', '.lib'} and not self.should_install()
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 7b09a2c..40ce9d5 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -676,7 +676,7 @@ class Environment:
# acts as a linker driver, `-Dc_args` will not.
#
# We still use the original key as the base here, as
- # we want to inhert the machine and the compiler
+ # we want to inherit the machine and the compiler
# language
key = key.evolve('env_args')
env_opts[key].extend(p_list)
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index fd7d64e..c34f9ab 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -1872,7 +1872,7 @@ class Interpreter(InterpreterBase, HoldableObject):
"""
for out in outputs:
if has_multi_in and ('@PLAINNAME@' in out or '@BASENAME@' in out):
- raise InvalidArguments(f'{name}: output cannot containe "@PLAINNAME@" or "@BASENAME@" '
+ raise InvalidArguments(f'{name}: output cannot contain "@PLAINNAME@" or "@BASENAME@" '
'when there is more than one input (we can\'t know which to use)')
@typed_pos_args('custom_target', optargs=[str])
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
index 9628953..cac33a4 100644
--- a/mesonbuild/interpreter/interpreterobjects.py
+++ b/mesonbuild/interpreter/interpreterobjects.py
@@ -323,7 +323,7 @@ class ConfigurationDataHolder(ObjectHolder[build.ConfigurationData], MutableInte
@typed_kwargs('configuration_data.set10', _CONF_DATA_SET_KWS)
def set10_method(self, args: T.Tuple[str, T.Union[int, bool]], kwargs: 'kwargs.ConfigurationDataSet') -> None:
self.__check_used()
- # bool is a subclass of int, so we need to check for bool excplicitly.
+ # bool is a subclass of int, so we need to check for bool explicitly.
# We already have typed_pos_args checking that this is either a bool or
# an int.
if not isinstance(args[1], bool):
diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py
index 86b82b9..1589c65 100644
--- a/mesonbuild/interpreter/kwargs.py
+++ b/mesonbuild/interpreter/kwargs.py
@@ -211,7 +211,7 @@ class _FoundProto(Protocol):
"""Protocol for subdir arguments.
- This allows us to define any objec that has a found(self) -> bool method
+ This allows us to define any object that has a found(self) -> bool method
"""
def found(self) -> bool: ...
diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py
index e43c56b..8e25f53 100644
--- a/mesonbuild/linkers/detect.py
+++ b/mesonbuild/linkers/detect.py
@@ -104,7 +104,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
prefix=comp_class.LINKER_PREFIX if use_linker_prefix else [],
exelist=compiler, version=search_version(o), direct=invoked_directly)
elif 'OPTLINK' in o:
- # Opltink's stdout *may* beging with a \r character.
+ # Optlink's stdout *may* begin with a \r character.
return OptlinkDynamicLinker(compiler, for_machine, version=search_version(o))
elif o.startswith('Microsoft') or e.startswith('Microsoft'):
out = o or e
diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
index ee7d009..3385dd3 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
@@ -1470,7 +1470,7 @@ class OptlinkDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker):
def __init__(self, exelist: T.List[str], for_machine: mesonlib.MachineChoice,
*, version: str = 'unknown version'):
- # Use optlink instead of link so we don't interfer with other link.exe
+ # Use optlink instead of link so we don't interfere with other link.exe
# implementations.
super().__init__(exelist, for_machine, '', [], version=version)