aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/arglist.py10
-rw-r--r--mesonbuild/cmake/data/preload.cmake4
-rw-r--r--mesonbuild/cmake/interpreter.py2
-rw-r--r--mesonbuild/cmake/traceparser.py2
-rw-r--r--mesonbuild/compilers/c.py2
-rw-r--r--mesonbuild/compilers/compilers.py6
-rw-r--r--mesonbuild/compilers/mixins/clike.py4
-rw-r--r--mesonbuild/dependencies/base.py2
-rw-r--r--mesonbuild/dependencies/boost.py2
-rw-r--r--mesonbuild/dependencies/misc.py2
-rw-r--r--mesonbuild/envconfig.py6
-rw-r--r--mesonbuild/interpreter.py2
-rw-r--r--mesonbuild/interpreterbase.py2
-rw-r--r--mesonbuild/mcompile.py2
-rw-r--r--mesonbuild/mesondata.py6
-rw-r--r--mesonbuild/mesonlib.py2
-rw-r--r--mesonbuild/modules/fs.py2
-rw-r--r--mesonbuild/modules/hotdoc.py4
-rw-r--r--mesonbuild/modules/unstable_rust.py2
-rwxr-xr-xmesonbuild/scripts/cmake_run_ctgt.py2
-rw-r--r--mesonbuild/scripts/depscan.py2
21 files changed, 34 insertions, 34 deletions
diff --git a/mesonbuild/arglist.py b/mesonbuild/arglist.py
index d1d489b..23b1924 100644
--- a/mesonbuild/arglist.py
+++ b/mesonbuild/arglist.py
@@ -36,7 +36,7 @@ class Dedup(enum.Enum):
"""What kind of deduplication can be done to compiler args.
- OVERRIDEN - Whether an argument can be 'overridden' by a later argument.
+ OVERRIDDEN - Whether an argument can be 'overridden' by a later argument.
For example, -DFOO defines FOO and -UFOO undefines FOO. In this case,
we can safely remove the previous occurrence and add a new one. The
same is true for include paths and library paths with -I and -L.
@@ -50,7 +50,7 @@ class Dedup(enum.Enum):
NO_DEDUP = 0
UNIQUE = 1
- OVERRIDEN = 2
+ OVERRIDDEN = 2
class CompilerArgs(collections.abc.MutableSequence):
@@ -129,13 +129,13 @@ class CompilerArgs(collections.abc.MutableSequence):
dedup = self._can_dedup(a)
if a not in pre_flush_set:
new.append(a)
- if dedup is Dedup.OVERRIDEN:
+ if dedup is Dedup.OVERRIDDEN:
pre_flush_set.add(a)
for a in reversed(self.post):
dedup = self._can_dedup(a)
if a not in post_flush_set:
post_flush.appendleft(a)
- if dedup is Dedup.OVERRIDEN:
+ if dedup is Dedup.OVERRIDDEN:
post_flush_set.add(a)
#pre and post will overwrite every element that is in the container
@@ -219,7 +219,7 @@ class CompilerArgs(collections.abc.MutableSequence):
if arg in cls.dedup2_args or \
arg.startswith(cls.dedup2_prefixes) or \
arg.endswith(cls.dedup2_suffixes):
- return Dedup.OVERRIDEN
+ return Dedup.OVERRIDDEN
if arg in cls.dedup1_args or \
arg.startswith(cls.dedup1_prefixes) or \
arg.endswith(cls.dedup1_suffixes) or \
diff --git a/mesonbuild/cmake/data/preload.cmake b/mesonbuild/cmake/data/preload.cmake
index 34d38e3..234860b 100644
--- a/mesonbuild/cmake/data/preload.cmake
+++ b/mesonbuild/cmake/data/preload.cmake
@@ -15,8 +15,8 @@ macro(meson_ps_reload_vars)
endmacro()
macro(meson_ps_disabled_function)
- message(WARNING "The function '${ARGV0}' is disabled in the context of CMake subporjects.\n"
- "This should not be an issue but may lead to compilaton errors.")
+ message(WARNING "The function '${ARGV0}' is disabled in the context of CMake subprojects.\n"
+ "This should not be an issue but may lead to compilation errors.")
endmacro()
# Helper macro to inspect the current CMake state
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index 1a533db..782b7c2 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -603,7 +603,7 @@ class ConverterTarget:
except KeyError:
return []
- # TODO: Get rid of this once we have propper typing for options
+ # TODO: Get rid of this once we have proper typing for options
assert isinstance(res, list)
for i in res:
assert isinstance(i, str)
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py
index 613b4b2..298c6b8 100644
--- a/mesonbuild/cmake/traceparser.py
+++ b/mesonbuild/cmake/traceparser.py
@@ -323,7 +323,7 @@ class CMakeTraceParser:
def _cmake_add_custom_command(self, tline: CMakeTraceLine, name: T.Optional[str] = None) -> None:
# DOC: https://cmake.org/cmake/help/latest/command/add_custom_command.html
- args = self._flatten_args(list(tline.args)) # Commands can be passed as ';' seperated lists
+ args = self._flatten_args(list(tline.args)) # Commands can be passed as ';' separated lists
if not args:
return self._gen_exception('add_custom_command', 'requires at least 1 argument', tline)
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 4a55b46..c11319b 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -98,7 +98,7 @@ class CCompiler(CLikeCompiler, Compiler):
opts = super().get_options()
opts.update({
OptionKey('std', machine=self.for_machine, lang=self.language): coredata.UserComboOption(
- 'C langauge standard to use',
+ 'C language standard to use',
['none'],
'none',
)
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index cf9f35b..0f83f4c 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -69,7 +69,7 @@ all_languages = lang_suffixes.keys()
cpp_suffixes = lang_suffixes['cpp'] + ('h',) # type: T.Tuple[str, ...]
c_suffixes = lang_suffixes['c'] + ('h',) # type: T.Tuple[str, ...]
# List of languages that by default consume and output libraries following the
-# C ABI; these can generally be used interchangebly
+# C ABI; these can generally be used interchangeably
clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'fortran',) # type: T.Tuple[str, ...]
# List of languages that can be linked with C code directly by the linker
# used in build.py:process_compilers() and build.py:get_dynamic_linker()
@@ -1199,14 +1199,14 @@ def get_global_options(lang: str,
comp: T.Type[Compiler],
for_machine: MachineChoice,
env: 'Environment') -> 'KeyedOptionDictType':
- """Retreive options that apply to all compilers for a given language."""
+ """Retrieve options that apply to all compilers for a given language."""
description = 'Extra arguments passed to the {}'.format(lang)
argkey = OptionKey('args', lang=lang, machine=for_machine)
largkey = argkey.evolve('link_args')
# We shouldn't need listify here, but until we have a separate
# linker-driver representation and can have that do the combine we have to
- # do it htis way.
+ # do it this way.
compile_args = mesonlib.listify(env.options.get(argkey, []))
link_args = mesonlib.listify(env.options.get(largkey, []))
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index 3288c00..ad3bfae 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -236,7 +236,7 @@ class CLikeCompiler(Compiler):
retval.append(d)
# at this point, it's an ELF file which doesn't match the
# appropriate elf_class, so skip this one
- # stop scanning after the first sucessful read
+ # stop scanning after the first successful read
break
except OSError:
# Skip the file if we can't read it
@@ -1271,7 +1271,7 @@ class CLikeCompiler(Compiler):
def get_has_func_attribute_extra_args(self, name: str) -> T.List[str]:
# Most compilers (such as GCC and Clang) only warn about unknown or
- # ignored attributes, so force an error. Overriden in GCC and Clang
+ # ignored attributes, so force an error. Overridden in GCC and Clang
# mixins.
return ['-Werror']
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 99faf4a..e72f346 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -1244,7 +1244,7 @@ class CMakeDependency(ExternalDependency):
if not self._cached_isdir(i):
continue
- # Check the directory case insensitve
+ # Check the directory case insensitive
content = self._cached_listdir(i)
candidates = ['Find{}.cmake', '{}Config.cmake', '{}-config.cmake']
candidates = [x.format(name).lower() for x in candidates]
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index d12f37c..8fb258e 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -601,7 +601,7 @@ class BoostDependency(ExternalDependency):
libs = [x for x in libs if x.nvsuffix != 'dll'] # Only link to import libraries
# Only filter by debug when we are building in release mode. Debug
- # libraries are automatically prefered through sorting otherwise.
+ # libraries are automatically preferred through sorting otherwise.
if not self.debug:
libs = [x for x in libs if not x.debug]
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 15055aa..b0b8f4a 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -490,7 +490,7 @@ def curses_factory(env: 'Environment', for_machine: 'MachineChoice',
candidates.append(functools.partial(PkgConfigDependency, pkg, env, kwargs))
# There are path handling problems with these methods on msys, and they
- # don't apply to windows otherwise (cygwin is handled seperately from
+ # don't apply to windows otherwise (cygwin is handled separately from
# windows)
if not env.machines[for_machine].is_windows():
if DependencyMethods.CONFIG_TOOL in methods:
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index c133ec9..6713135 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -68,9 +68,9 @@ known_cpu_families = (
'x86_64',
)
-# It would feel more natural to call this "64_BIT_CPU_FAMILES", but
+# It would feel more natural to call this "64_BIT_CPU_FAMILIES", but
# python identifiers cannot start with numbers
-CPU_FAMILES_64_BIT = [
+CPU_FAMILIES_64_BIT = [
'aarch64',
'alpha',
'ia64',
@@ -231,7 +231,7 @@ class MachineInfo:
self.cpu_family = cpu_family
self.cpu = cpu
self.endian = endian
- self.is_64_bit = cpu_family in CPU_FAMILES_64_BIT # type: bool
+ self.is_64_bit = cpu_family in CPU_FAMILIES_64_BIT # type: bool
def __eq__(self, other: object) -> bool:
if not isinstance(other, MachineInfo):
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 1a946a7..aa0c58e 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3453,7 +3453,7 @@ external dependencies (including libraries) must go to "dependencies".''')
continue
if name in self.build.find_overrides:
exe = self.build.find_overrides[name]
- extra_info.append(mlog.blue('(overriden)'))
+ extra_info.append(mlog.blue('(overridden)'))
return ExternalProgramHolder(exe, self.subproject, self.backend)
return None
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index e57580b..f17dfba 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -893,7 +893,7 @@ The result of this is undefined and will become a hard error in a future Meson r
# TODO maybe find a better solution
return iobject[index] # type: ignore
except IndexError:
- # We are already checking for the existance of __getitem__, so this should be save
+ # We are already checking for the existence of __getitem__, so this should be save
raise InterpreterException('Index %d out of bounds of array of size %d.' % (index, len(iobject))) # type: ignore
def function_call(self, node: mparser.FunctionNode) -> T.Optional[TYPE_var]:
diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py
index 140e88f..16eb82a 100644
--- a/mesonbuild/mcompile.py
+++ b/mesonbuild/mcompile.py
@@ -89,7 +89,7 @@ class ParsedTargetName:
@staticmethod
def _is_valid_type(type: str) -> bool:
- # Ammend docs in Commands.md when editing this list
+ # Amend docs in Commands.md when editing this list
allowed_types = {
'executable',
'static_library',
diff --git a/mesonbuild/mesondata.py b/mesonbuild/mesondata.py
index 398ee69..b9a4c10 100644
--- a/mesonbuild/mesondata.py
+++ b/mesonbuild/mesondata.py
@@ -48,8 +48,8 @@ macro(meson_ps_reload_vars)
endmacro()
macro(meson_ps_disabled_function)
- message(WARNING "The function '${ARGV0}' is disabled in the context of CMake subporjects.\n"
- "This should not be an issue but may lead to compilaton errors.")
+ message(WARNING "The function '${ARGV0}' is disabled in the context of CMake subprojects.\n"
+ "This should not be an issue but may lead to compilation errors.")
endmacro()
# Helper macro to inspect the current CMake state
@@ -373,7 +373,7 @@ class DataFile:
mesondata = {
'cmake/data/preload.cmake': DataFile(
Path('cmake/data/preload.cmake'),
- '2b4e632aeb74acb2b441880cf85c0b6fcab03e75b182d3077715a97e739a7918',
+ 'ce8f30159aab25b92c26c58a219a427d47838bfa0739475221d6c8993b4946e5',
file_0_data_preload_cmake,
),
'dependencies/data/CMakeLists.txt': DataFile(
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 2c1727b..ef48ec2 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -1597,7 +1597,7 @@ def relpath(path: str, start: str) -> str:
return path
def path_is_in_root(path: Path, root: Path, resolve: bool = False) -> bool:
- # Check wheter a path is within the root directory root
+ # Check whether a path is within the root directory root
try:
if resolve:
path.resolve().relative_to(root.resolve())
diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py
index 5ba1e38..2ff256b 100644
--- a/mesonbuild/modules/fs.py
+++ b/mesonbuild/modules/fs.py
@@ -45,7 +45,7 @@ class FSModule(ExtensionModule):
"""
path = self._absolute_dir(state, arg)
try:
- # accomodate unresolvable paths e.g. symlink loops
+ # accommodate unresolvable paths e.g. symlink loops
path = path.resolve()
except Exception:
# return the best we could do
diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py
index ee756e7..931db12 100644
--- a/mesonbuild/modules/hotdoc.py
+++ b/mesonbuild/modules/hotdoc.py
@@ -281,7 +281,7 @@ class HotdocTargetBuilder:
return os.path.relpath(_dir, os.path.join(self.builddir, self.subdir))
- def check_forbiden_args(self):
+ def check_forbidden_args(self):
for arg in ['conf_file']:
if arg in self.kwargs:
raise InvalidArguments('Argument "%s" is forbidden.' % arg)
@@ -290,7 +290,7 @@ class HotdocTargetBuilder:
self.include_paths[path] = path
def make_targets(self):
- self.check_forbiden_args()
+ self.check_forbidden_args()
file_types = (str, mesonlib.File)
self.process_known_arg("--index", file_types, mandatory=True, value_processor=self.ensure_file)
self.process_known_arg("--project-version", str, mandatory=True)
diff --git a/mesonbuild/modules/unstable_rust.py b/mesonbuild/modules/unstable_rust.py
index 72b5217..02369b6 100644
--- a/mesonbuild/modules/unstable_rust.py
+++ b/mesonbuild/modules/unstable_rust.py
@@ -40,7 +40,7 @@ class RustModule(ExtensionModule):
Rust puts it's unitests inside it's main source files, unlike most
languages that put them in external files. This means that normally
- you have to define two seperate targets with basically the same
+ you have to define two separate targets with basically the same
arguments to get tests:
```meson
diff --git a/mesonbuild/scripts/cmake_run_ctgt.py b/mesonbuild/scripts/cmake_run_ctgt.py
index 2d9aeca..3f6f2af 100755
--- a/mesonbuild/scripts/cmake_run_ctgt.py
+++ b/mesonbuild/scripts/cmake_run_ctgt.py
@@ -16,7 +16,7 @@ def run(argsv: T.List[str]) -> int:
parser.add_argument('-d', '--directory', type=str, metavar='D', required=True, help='Working directory to cwd to')
parser.add_argument('-o', '--outputs', nargs='+', metavar='O', required=True, help='Expected output files')
parser.add_argument('-O', '--original-outputs', nargs='*', metavar='O', default=[], help='Output files expected by CMake')
- parser.add_argument('commands', nargs=argparse.REMAINDER, help='A "{}" seperated list of commands'.format(SEPARATOR))
+ parser.add_argument('commands', nargs=argparse.REMAINDER, help='A "{}" separated list of commands'.format(SEPARATOR))
# Parse
args = parser.parse_args(argsv)
diff --git a/mesonbuild/scripts/depscan.py b/mesonbuild/scripts/depscan.py
index 9fffb11..df7df48 100644
--- a/mesonbuild/scripts/depscan.py
+++ b/mesonbuild/scripts/depscan.py
@@ -164,7 +164,7 @@ class DependencyScanner:
if modname not in self.provided_by:
# Nothing provides this module, we assume that it
# comes from a dependency library somewhere and is
- # already built by the time this complation starts.
+ # already built by the time this compilation starts.
pass
else:
mods_and_submods_needed.append(modname)
generated by cgit v1.1 at 2024-11-06 08:04:21 +0000