summaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorspaette <spaette@users.noreply.github.com>2024-09-11 13:05:04 -0500
committerDylan Baker <dylan@pnwbakers.com>2024-09-11 15:51:04 -0700
commit4179996fefd272cc0c893b88ad17c010fa037768 (patch)
treea5f7f8ff03bb5b6d39556331d4c2e163f7718c14 /mesonbuild
parent3aedec5b34c586b9c3a16be17d2fda353bf5fff1 (diff)
downloadmeson-4179996fefd272cc0c893b88ad17c010fa037768.tar.gz
Fix typos
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/backends.py2
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/backend/vs2010backend.py4
-rw-r--r--mesonbuild/cargo/builder.py8
-rw-r--r--mesonbuild/cargo/interpreter.py4
-rw-r--r--mesonbuild/cmake/generator.py2
-rw-r--r--mesonbuild/cmake/interpreter.py2
-rw-r--r--mesonbuild/compilers/detect.py8
-rw-r--r--mesonbuild/dependencies/boost.py2
-rw-r--r--mesonbuild/environment.py4
-rw-r--r--mesonbuild/interpreter/interpreter.py2
-rw-r--r--mesonbuild/modules/__init__.py2
-rw-r--r--mesonbuild/msetup.py2
-rw-r--r--mesonbuild/options.py2
14 files changed, 24 insertions, 24 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index e35660b69..079b62dbd 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -1135,7 +1135,7 @@ class Backend:
if p.is_file():
p = p.parent
- # Heuristic: replace *last* occurence of '/lib'
+ # Heuristic: replace *last* occurrence of '/lib'
binpath = Path('/bin'.join(p.as_posix().rsplit('/lib', maxsplit=1)))
for _ in binpath.glob('*.dll'):
return str(binpath)
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 1eeda96a8..91603025b 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -101,7 +101,7 @@ def get_rsp_threshold() -> int:
# and that has a limit of 8k.
limit = 8192
else:
- # Unix-like OSes usualy have very large command line limits, (On Linux,
+ # Unix-like OSes usually have very large command line limits, (On Linux,
# for example, this is limited by the kernel's MAX_ARG_STRLEN). However,
# some programs place much lower limits, notably Wine which enforces a
# 32k limit like Windows. Therefore, we limit the command line to 32k.
@@ -3135,7 +3135,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
# Fortran is a bit weird (again). When you link against a library, just compiling a source file
# requires the mod files that are output when single files are built. To do this right we would need to
- # scan all inputs and write out explicit deps for each file. That is stoo slow and too much effort so
+ # scan all inputs and write out explicit deps for each file. That is too slow and too much effort so
# instead just have an ordered dependency on the library. This ensures all required mod files are created.
# The real deps are then detected via dep file generation from the compiler. This breaks on compilers that
# produce incorrect dep files but such is life.
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index a12963cde..08a19c659 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -879,7 +879,7 @@ class Vs2010Backend(backends.Backend):
ET.SubElement(parent_node, 'PreprocessorDefinitions', Condition=condition).text = defs
ET.SubElement(parent_node, 'AdditionalIncludeDirectories', Condition=condition).text = paths
ET.SubElement(parent_node, 'AdditionalOptions', Condition=condition).text = opts
- else: # Can't find bespoke nmake defs/dirs/opts fields for this extention, so just reference the project's fields
+ else: # Can't find bespoke nmake defs/dirs/opts fields for this extension, so just reference the project's fields
ET.SubElement(parent_node, 'PreprocessorDefinitions').text = '$(NMakePreprocessorDefinitions)'
ET.SubElement(parent_node, 'AdditionalIncludeDirectories').text = '$(NMakeIncludeSearchPath)'
ET.SubElement(parent_node, 'AdditionalOptions').text = '$(AdditionalOptions)'
@@ -1542,7 +1542,7 @@ class Vs2010Backend(backends.Backend):
# the solution's configurations. Similarly, 'ItemGroup' also doesn't support 'Condition'. So, without knowing
# a better (simple) alternative, for now, we'll repoint these generated sources (which will be incorrectly
# pointing to non-existent files under our '[builddir]_vs' directory) to the appropriate location under one of
- # our buildtype build directores (e.g. '[builddir]_debug').
+ # our buildtype build directories (e.g. '[builddir]_debug').
# This will at least allow the user to open the files of generated sources listed in the solution explorer,
# once a build/compile has generated these sources.
#
diff --git a/mesonbuild/cargo/builder.py b/mesonbuild/cargo/builder.py
index 99659da11..112c7c580 100644
--- a/mesonbuild/cargo/builder.py
+++ b/mesonbuild/cargo/builder.py
@@ -133,7 +133,7 @@ class Builder:
:param lhs: The left hand side of the equal
:param rhs: the right hand side of the equal
- :return: A compraison node
+ :return: A comparison node
"""
return mparser.ComparisonNode('==', lhs, self._symbol('=='), rhs)
@@ -142,7 +142,7 @@ class Builder:
:param lhs: The left hand side of the "!="
:param rhs: the right hand side of the "!="
- :return: A compraison node
+ :return: A comparison node
"""
return mparser.ComparisonNode('!=', lhs, self._symbol('!='), rhs)
@@ -151,7 +151,7 @@ class Builder:
:param lhs: The left hand side of the "in"
:param rhs: the right hand side of the "in"
- :return: A compraison node
+ :return: A comparison node
"""
return mparser.ComparisonNode('in', lhs, self._symbol('in'), rhs)
@@ -160,7 +160,7 @@ class Builder:
:param lhs: The left hand side of the "not in"
:param rhs: the right hand side of the "not in"
- :return: A compraison node
+ :return: A comparison node
"""
return mparser.ComparisonNode('notin', lhs, self._symbol('not in'), rhs)
diff --git a/mesonbuild/cargo/interpreter.py b/mesonbuild/cargo/interpreter.py
index 98ffa50ac..5f89c05ec 100644
--- a/mesonbuild/cargo/interpreter.py
+++ b/mesonbuild/cargo/interpreter.py
@@ -106,7 +106,7 @@ def _fixup_raw_mappings(d: T.Union[manifest.BuildTarget, manifest.LibTarget, man
This does the following:
* replaces any `-` with `_`, cargo likes the former, but python dicts make
keys with `-` in them awkward to work with
- * Convert Dependndency versions from the cargo format to something meson
+ * Convert Dependency versions from the cargo format to something meson
understands
:param d: The mapping to fix
@@ -732,7 +732,7 @@ def interpret(subp_name: str, subdir: str, env: Environment) -> T.Tuple[mparser.
ast += _create_meson_subdir(cargo, build)
# Libs are always auto-discovered and there's no other way to handle them,
- # which is unfortunate for reproducability
+ # which is unfortunate for reproducibility
if os.path.exists(os.path.join(env.source_dir, cargo.subdir, cargo.path, cargo.lib.path)):
for crate_type in cargo.lib.crate_type:
ast.extend(_create_lib(cargo, build, crate_type))
diff --git a/mesonbuild/cmake/generator.py b/mesonbuild/cmake/generator.py
index b78860564..a617f8adb 100644
--- a/mesonbuild/cmake/generator.py
+++ b/mesonbuild/cmake/generator.py
@@ -20,7 +20,7 @@ def parse_generator_expressions(
'''Parse CMake generator expressions
Most generator expressions are simply ignored for
- simplicety, however some are required for some common
+ simplicity, however some are required for some common
use cases.
'''
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index a0fcb6972..683991c54 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -487,7 +487,7 @@ class ConverterTarget:
source_files = [x.name for x in i.sources + i.generated]
for j in stem:
# On some platforms (specifically looking at you Windows with vs20xy backend) CMake does
- # not produce object files with the format `foo.cpp.obj`, instead it skipps the language
+ # not produce object files with the format `foo.cpp.obj`, instead it skips the language
# suffix and just produces object files like `foo.obj`. Thus we have to do our best to
# undo this step and guess the correct language suffix of the object file. This is done
# by trying all language suffixes meson knows and checking if one of them fits.
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
index 22c5cb5aa..c1d004b32 100644
--- a/mesonbuild/compilers/detect.py
+++ b/mesonbuild/compilers/detect.py
@@ -39,7 +39,7 @@ defaults: T.Dict[str, T.List[str]] = {}
if is_windows():
# Intel C and C++ compiler is icl on Windows, but icc and icpc elsewhere.
# Search for icl before cl, since Intel "helpfully" provides a
- # cl.exe that returns *exactly the same thing* that microsofts
+ # cl.exe that returns *exactly the same thing* that Microsoft's
# cl.exe does, and if icl is present, it's almost certainly what
# you want.
defaults['c'] = ['icl', 'cl', 'cc', 'gcc', 'clang', 'clang-cl', 'pgcc']
@@ -181,7 +181,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker
else:
trials = default_linkers
elif compiler.id == 'intel-cl' and compiler.language == 'c': # why not cpp? Is this a bug?
- # Intel has its own linker that acts like microsoft's lib
+ # Intel has its own linker that acts like Microsoft's lib
trials = [['xilib']]
elif is_windows() and compiler.id == 'pgi': # this handles cpp / nvidia HPC, in addition to just c/fortran
trials = [['ar']] # For PGI on Windows, "ar" is just a wrapper calling link/lib.
@@ -585,7 +585,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
lnk = linkers.MetrowerksLinkerEmbeddedPowerPC
mwcc_ver_match = re.search(r'Version (\d+)\.(\d+)\.?(\d+)? build (\d+)', out)
- assert mwcc_ver_match is not None, 'for mypy' # because mypy *should* be complaning that this could be None
+ assert mwcc_ver_match is not None, 'for mypy' # because mypy *should* be complaining that this could be None
compiler_version = '.'.join(x for x in mwcc_ver_match.groups() if x is not None)
env.coredata.add_lang_args(cls.language, cls, for_machine, env)
@@ -595,7 +595,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
_, o_ld, _ = Popen_safe(ld + ['--version'])
mwld_ver_match = re.search(r'Version (\d+)\.(\d+)\.?(\d+)? build (\d+)', o_ld)
- assert mwld_ver_match is not None, 'for mypy' # because mypy *should* be complaning that this could be None
+ assert mwld_ver_match is not None, 'for mypy' # because mypy *should* be complaining that this could be None
linker_version = '.'.join(x for x in mwld_ver_match.groups() if x is not None)
linker = lnk(ld, for_machine, version=linker_version)
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 19d492977..870c0b16b 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -56,7 +56,7 @@ if T.TYPE_CHECKING:
# Mac / homebrew: libboost_<module>.dylib + libboost_<module>-mt.dylib (location = /usr/local/lib)
# Mac / macports: libboost_<module>.dylib + libboost_<module>-mt.dylib (location = /opt/local/lib)
#
-# Its not clear that any other abi tags (e.g. -gd) are used in official packages.
+# It's not clear that any other abi tags (e.g. -gd) are used in official packages.
#
# On Linux systems, boost libs have multithreading support enabled, but without the -mt tag.
#
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 5cff86bb1..90c9bb911 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -329,7 +329,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
"""
Python is inconsistent in its platform module.
It returns different values for the same cpu.
- For x86 it might return 'x86', 'i686' or somesuch.
+ For x86 it might return 'x86', 'i686' or some such.
Do some canonicalization.
"""
if mesonlib.is_windows():
@@ -466,7 +466,7 @@ def detect_kernel(system: str) -> T.Optional[str]:
raise MesonException('Failed to run "/usr/bin/uname -o"')
out = out.lower().strip()
if out not in {'illumos', 'solaris'}:
- mlog.warning(f'Got an unexpected value for kernel on a SunOS derived platform, expcted either "illumos" or "solaris", but got "{out}".'
+ mlog.warning(f'Got an unexpected value for kernel on a SunOS derived platform, expected either "illumos" or "solaris", but got "{out}".'
"Please open a Meson issue with the OS you're running and the value detected for your kernel.")
return None
return out
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index 9bbab5d60..eceb40a6b 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -3459,7 +3459,7 @@ class Interpreter(InterpreterBase, HoldableObject):
if kwargs['implib']:
if kwargs['export_dynamic'] is False:
- FeatureDeprecated.single_use('implib overrides explict export_dynamic off', '1.3.0', self.subproject,
+ FeatureDeprecated.single_use('implib overrides explicit export_dynamic off', '1.3.0', self.subproject,
'Do not set ths if want export_dynamic disabled if implib is enabled',
location=node)
kwargs['export_dynamic'] = True
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py
index 3fe4956c7..86dc8762e 100644
--- a/mesonbuild/modules/__init__.py
+++ b/mesonbuild/modules/__init__.py
@@ -113,7 +113,7 @@ class ModuleState:
if wanted:
kwargs['version'] = wanted
# FIXME: Even if we fix the function, mypy still can't figure out what's
- # going on here. And we really dont want to call interpreter
+ # going on here. And we really don't want to call interpreter
# implementations of meson functions anyway.
return self._interpreter.func_dependency(self.current_node, [depname], kwargs) # type: ignore
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py
index 5dfda6705..81f4af1c4 100644
--- a/mesonbuild/msetup.py
+++ b/mesonbuild/msetup.py
@@ -354,7 +354,7 @@ def run(options: T.Union[CMDOptions, T.List[str]]) -> int:
coredata.parse_cmd_line_options(options)
# Msetup doesn't actually use this option, but we pass msetup options to
- # mconf, and it does. We won't actally hit the path that uses it, but don't
+ # mconf, and it does. We won't actually hit the path that uses it, but don't
# lie
options.pager = False
diff --git a/mesonbuild/options.py b/mesonbuild/options.py
index 9f65cc6b7..1566f940c 100644
--- a/mesonbuild/options.py
+++ b/mesonbuild/options.py
@@ -110,7 +110,7 @@ class OptionKey:
def __init__(self, name: str, subproject: str = '',
machine: MachineChoice = MachineChoice.HOST):
# the _type option to the constructor is kinda private. We want to be
- # able tos ave the state and avoid the lookup function when
+ # able to save the state and avoid the lookup function when
# pickling/unpickling, but we need to be able to calculate it when
# constructing a new OptionKey
object.__setattr__(self, 'name', name)