Fix typos discovered by codespell

pull/9385/head
Christian Clauss 3 years ago committed by Eli Schwartz
parent 32b7cbd4a7
commit a5020857f3
  1. 2
      .github/workflows/website.yml
  2. 2
      ci/run.ps1
  3. 2
      data/shell-completions/zsh/_meson
  4. 2
      docs/markdown/CMake-module.md
  5. 2
      docs/markdown/Cross-compilation.md
  6. 2
      docs/markdown/Dependencies.md
  7. 2
      docs/markdown/Installing.md
  8. 4
      docs/markdown/Machine-files.md
  9. 4
      docs/markdown/MesonCI.md
  10. 4
      docs/markdown/Reference-tables.md
  11. 4
      docs/markdown/Release-notes-for-0.42.0.md
  12. 2
      docs/markdown/Release-notes-for-0.48.0.md
  13. 2
      docs/markdown/Release-notes-for-0.51.0.md
  14. 2
      docs/markdown/Release-notes-for-0.52.0.md
  15. 2
      docs/markdown/Release-notes-for-0.54.0.md
  16. 2
      docs/markdown/Release-notes-for-0.55.0.md
  17. 6
      docs/markdown/Release-notes-for-0.58.0.md
  18. 2
      docs/markdown/Rust-module.md
  19. 6
      docs/markdown/Syntax.md
  20. 4
      docs/markdown/_include_qt_base.md
  21. 2
      docs/markdown/snippets/qt_module_generated_inputs.md
  22. 2
      mesonbuild/arglist.py
  23. 2
      mesonbuild/backend/vs2010backend.py
  24. 2
      mesonbuild/build.py
  25. 2
      mesonbuild/cmake/interpreter.py
  26. 2
      mesonbuild/compilers/compilers.py
  27. 6
      mesonbuild/compilers/cpp.py
  28. 4
      mesonbuild/compilers/cuda.py
  29. 6
      mesonbuild/compilers/d.py
  30. 4
      mesonbuild/compilers/fortran.py
  31. 4
      mesonbuild/compilers/mixins/clang.py
  32. 6
      mesonbuild/compilers/mixins/visualstudio.py
  33. 2
      mesonbuild/coredata.py
  34. 2
      mesonbuild/dependencies/base.py
  35. 6
      mesonbuild/dependencies/boost.py
  36. 2
      mesonbuild/dependencies/cuda.py
  37. 2
      mesonbuild/dependencies/factory.py
  38. 4
      mesonbuild/dependencies/misc.py
  39. 6
      mesonbuild/dependencies/qt.py
  40. 6
      mesonbuild/environment.py
  41. 6
      mesonbuild/interpreter/compiler.py
  42. 8
      mesonbuild/interpreter/interpreter.py
  43. 4
      mesonbuild/interpreter/interpreterobjects.py
  44. 2
      mesonbuild/interpreter/mesonmain.py
  45. 4
      mesonbuild/interpreter/type_checking.py
  46. 2
      mesonbuild/interpreterbase/baseobjects.py
  47. 10
      mesonbuild/interpreterbase/decorators.py
  48. 2
      mesonbuild/interpreterbase/operator.py
  49. 2
      mesonbuild/linkers/linkers.py
  50. 2
      mesonbuild/mcompile.py
  51. 4
      mesonbuild/mesonlib/platform.py
  52. 2
      mesonbuild/mesonlib/universal.py
  53. 2
      mesonbuild/minstall.py
  54. 6
      mesonbuild/modules/python.py
  55. 6
      mesonbuild/modules/qt.py
  56. 2
      mesonbuild/programs.py
  57. 2
      mesonbuild/scripts/cmd_or_ps.ps1
  58. 2
      mesonbuild/scripts/depfixer.py
  59. 2
      packaging/createmsi.py
  60. 2
      test cases/cmake/13 system includes/meson.build
  61. 2
      test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp
  62. 2
      test cases/common/118 llvm ir and assembly/meson.build
  63. 2
      test cases/common/235 invalid standard overriden to valid/meson.build
  64. 2
      test cases/common/245 dependency fallbacks/meson.build
  65. 2
      test cases/common/56 array methods/meson.build
  66. 2
      test cases/linuxlike/13 cmake dependency/meson.build
  67. 2
      test cases/rust/13 external c dependencies/meson.build
  68. 2
      test cases/rust/14 external libm/meson.build
  69. 2
      test cases/rust/2 sharedlib/meson.build
  70. 2
      test cases/rust/4 polyglot/meson.build
  71. 2
      unittests/allplatformstests.py
  72. 2
      unittests/internaltests.py

@ -3,7 +3,7 @@ name: Update website
concurrency:
group: mesonbuild.com
# We do NOT want `cancel-in-progress` here since only one website job
# should run at a time to avoid upload race condtions.
# should run at a time to avoid upload race conditions.
on:
push:

@ -102,7 +102,7 @@ python3 -m coverage xml
python3 -m coverage report
# Currently codecov.py does not handle Azure, use this fork of a fork to get it
# working without requireing a token
# working without requiring a token
git clone https://github.com/mensinda/codecov-python
python3 -m pip install --ignore-installed ./codecov-python
python3 -m codecov -f .coverage/coverage.xml -n "VS$env:compiler $env:arch $env:backend" -c $env:SOURCE_VERSION

@ -210,7 +210,7 @@ local -a meson_commands=(
"$__meson_cd"
'--no-rebuild[Do not rebuild before installing]'
'--only-changed[Do not overwrite files that are older than the copied file]'
'--quiet[Do not print every fiel that was installed]'
'--quiet[Do not print every file that was installed]'
)
_arguments \
'(: -)'{'--help','-h'}'[show a help message and quit]' \

@ -160,7 +160,7 @@ following methods are supported:
- `set_override_option(opt, val)` set specific [build options](Build-options.md)
for targets. This will effectively add `opt=val` to the `override_options`
array of the [[build_target]]
- `set_install(bool)` override wether targets should be installed or not
- `set_install(bool)` override whether targets should be installed or not
- `append_compile_args(lang, arg1, ...)` append compile flags for a specific
language to the targets
- `append_link_args(arg1, ...)` append linger args to the targets

@ -203,7 +203,7 @@ There are two different values for the CPU. The first one is
value from [the CPU Family table](Reference-tables.md#cpu-families).
*Note* that Meson does not add `el` to end cpu_family value for little
endian systems. Big endian and little endian mips are both just
`mips`, with the `endian` field set approriately.
`mips`, with the `endian` field set appropriately.
The second value is `cpu` which is a more specific subtype for the
CPU. Typical values for a `x86` CPU family might include `i386` or

@ -203,7 +203,7 @@ it automatically.
Support for adding additional `COMPONENTS` for the CMake
`find_package` lookup is provided with the `components` kwarg
(*introduced in 0.54.0*). All specified componets will be passed
(*introduced in 0.54.0*). All specified components will be passed
directly to `find_package(COMPONENTS)`.
Support for packages which require a specified version for CMake

@ -114,7 +114,7 @@ $ DESTDIR=/path/to/staging/area meson install
```
Since *0.57.0* `--destdir` argument can be used instead of environment. In that
case Meson will set `DESTDIR` into environment when runing install scripts.
case Meson will set `DESTDIR` into environment when running install scripts.
Since *0.60.0* `DESTDIR` and `--destdir` can be a path relative to build
directory. An absolute path will be set into environment when executing scripts.

@ -250,7 +250,7 @@ list of strings.
**Note:** All occurrences of `\` in the value of all keys will be replaced with
a `/` since CMake has a lot of issues with correctly escaping `\` when
dealing with variables (even in cases where a path in `CMAKE_C_COMPILER`
is correctly escaped, CMake will still trip up internaly for instance)
is correctly escaped, CMake will still trip up internally for instance)
A custom toolchain file should be used (via the `cmake_toolchain_file`
property) if `\` support is required.
@ -348,7 +348,7 @@ overriding, but to allow composing files. This composition is done by
passing the command line argument multiple times:
```console
meson setup builddir/ --cross-file first.ini --cross-file second.ini --cross-file thrid.ini
meson setup builddir/ --cross-file first.ini --cross-file second.ini --cross-file third.ini
```
In this case `first.ini` will be loaded, then `second.ini`, with

@ -14,11 +14,11 @@ tests are run.
## Docker images
The Linux docker images are automatically built and uploaded by GitHub
actions. An image rebuild is triggerd when any of the image definition
actions. An image rebuild is triggered when any of the image definition
files are changed (in `ci/ciimage`) in the master branch.
Additionally, the images are also updated weekly.
Each docker image has one corresponding dirctory in `ci/ciimage` with
Each docker image has one corresponding directory in `ci/ciimage` with
an `image.json` and an `install.sh`.
### Image generation

@ -192,7 +192,7 @@ arguments](#language-arguments-parameter-names) instead.
| LDFLAGS | The linker flags, used for all languages |
N.B. these settings are specified per machine, and so the environment
varibles actually come in pairs. See the [environment variables per
variables actually come in pairs. See the [environment variables per
machine](#Environment-variables-per-machine) section for details.
## Function Attributes
@ -289,7 +289,7 @@ These are the values that can be passed to `dependency` function's
## Compiler and Linker selection variables
N.B. these settings are specified per machine, and so the environment
varibles actually come in pairs. See the [environment variables per
variables actually come in pairs. See the [environment variables per
machine](#Environment-variables-per-machine) section for details.
| Language | Compiler | Linker | Note |

@ -119,10 +119,10 @@ accepts the new `exclude_files` and `exclude_directories` keyword
arguments that allow specified files or directories to be excluded
from the installed subdirectory.
## Make all Meson functionality invokable via the main executable
## Make all Meson functionality invocable via the main executable
Previously Meson had multiple executables such as `mesonintrospect`
and `mesontest`. They are now invokable via the main Meson executable
and `mesontest`. They are now invocable via the main Meson executable
like this:
meson configure <arguments> # equivalent to mesonconf <options>

@ -15,7 +15,7 @@ to add everything by hand. This works but is a bit tedious.
In this release we have added new new options to manually toggle e.g.
optimization levels and debug info so those can be changed
independently of other options. For example by default the debug
buildtype has no optmization enabled at all. If you wish to use GCC's
buildtype has no optimization enabled at all. If you wish to use GCC's
`-Og` instead, you could set it with the following command:
```

@ -294,7 +294,7 @@ their syntax is not correct as a standalone target. In general
`include` files are meant to be injected inline as if they were copy
and pasted into the source file.
`include` was never standard and was superceded by Fortran 90 `module`.
`include` was never standard and was superseded by Fortran 90 `module`.
The `include` file is only recognized by Meson if it has a Fortran
file suffix, such as `.f` `.F` `.f90` `.F90` or similar. This is to

@ -94,7 +94,7 @@ linker internal re-architecture this has become possible
## Compiler and dynamic linker representation split
0.52.0 inclues a massive refactor of the representaitons of compilers to
0.52.0 includes a massive refactor of the representaitons of compilers to
tease apart the representations of compilers and dynamic linkers (ld). This
fixes a number of compiler/linker combinations. In particular this fixes
use GCC and vanilla clang on macOS.

@ -210,7 +210,7 @@ the following entry to your cross file's `properties` section:
skip_sanity_check = true
```
## Support for overiding the linker with ldc and gdc
## Support for overriding the linker with ldc and gdc
LDC (the llvm D compiler) and GDC (The Gnu D Compiler) now honor D_LD
linker variable (or d_ld in the cross file) and is able to pick

@ -191,7 +191,7 @@ option(
## Wrap fallback URL
Wrap files can now define `source_fallback_url` and
`patch_fallback_url` to be used in case the main server is temporaly
`patch_fallback_url` to be used in case the main server is temporarily
down.
## Clang coverage support

@ -20,7 +20,7 @@ when a project is being used as a subproject.
New method `meson.add_devenv()` adds an [`environment()`](#environment) object
to the list of environments that will be applied when using `meson devenv`
command line. This is useful for developpers who wish to use the project without
command line. This is useful for developers who wish to use the project without
installing it, it is often needed to set for example the path to plugins
directory, etc. Alternatively, a list or dictionary can be passed as first
argument.
@ -63,7 +63,7 @@ compilation faster and using `-pipe` [can cause sporadic build
failures in certain
cases](https://github.com/mesonbuild/meson/issues/8508).
## `meson.add_dist_script()` allowd in subprojects
## `meson.add_dist_script()` allowed in subprojects
`meson.add_dist_script()` can now be invoked from a subproject, it was a hard
error in earlier versions. Subproject dist scripts will only be executed
@ -100,7 +100,7 @@ up the path manually with `include_directories`.
`append()` and `prepend()` methods can now be called multiple times
on the same `varname`. Earlier Meson versions would warn and only the last
opperation was taking effect.
operation was taking effect.
```meson
env = environment()

@ -34,7 +34,7 @@ that automatically.
Additional, test only dependencies may be passed via the dependencies
argument.
### bindgen(*, input: string | BuildTarget | []string | []BuildTarget, output: strng, include_directories: []include_directories, c_args: []string, args: []string)
### bindgen(*, input: string | BuildTarget | []string | []BuildTarget, output: string, include_directories: []include_directories, c_args: []string, args: []string)
This function wraps bindgen to simplify creating rust bindings around C
libraries. This has two advantages over hand-rolling ones own with a

@ -180,8 +180,8 @@ functionality described below.
### String index
Stings support the indexing (`[<num>]`) operator. This operator allows (read
only) acessing a specific character. The returned value is guaranteed to be
Strings support the indexing (`[<num>]`) operator. This operator allows (read
only) accessing a specific character. The returned value is guaranteed to be
a string of length 1.
```meson
@ -513,7 +513,7 @@ executable('progname',
kwargs: d)
```
A single function can take keyword argumets both directly in the
A single function can take keyword arguments both directly in the
function call and indirectly via the `kwargs` keyword argument. The
only limitation is that it is a hard error to pass any particular key
both as a direct and indirect argument.

@ -58,7 +58,7 @@ compilation.
Has the following signature: `qt.preprocess(name: str | None, *sources: str)`
If the `name` parameter is passed then all of the rcc files will be wirtten to a single output file
If the `name` parameter is passed then all of the rcc files will be written to a single output file
The variadic `sources` arguments have been deprecated since Meson 0.59.0, as has the `sources` keyword argument. These passed files unmodified through the preprocessor, don't do this, just add the output of the generator to another sources list:
```meson
@ -76,7 +76,7 @@ This method takes the following keyword arguments:
- `uic_extra_arguments` string[]: any additional arguments to `uic`. Since v0.49.0.
- `rcc_extra_arguments` string[]: any additional arguments to `rcc`. Since v0.49.0.
- `dependencies` Dependency[]: dependency objects needed by moc. Available since v0.48.0.
- `sources`: a list of extra sources, which are added to the output unchaged. Deprecated in 0.59.0.
- `sources`: a list of extra sources, which are added to the output unchanged. Deprecated in 0.59.0.
It returns an array of targets and sources to pass to a compilation target.

@ -1,6 +1,6 @@
## The qt modules now accept generated outputs as inputs for qt.compile_*
This means you can uset `custom_target`, custom_target indecies
This means you can uset `custom_target`, custom_target indices
(`custom_target[0]`, for example), or the output of `generator.process` as
inputs to the various `qt.compile_*` methods.

@ -178,7 +178,7 @@ class CompilerArgs(collections.abc.MutableSequence):
def __setitem__(self, index: T.Union[int, slice], value: T.Union[str, T.Iterable[str]]) -> None: # noqa: F811
self.flush_pre_post()
self._container[index] = value # type: ignore # TODO: fix 'Invalid index type' and 'Incompatible types in assignment' erros
self._container[index] = value # type: ignore # TODO: fix 'Invalid index type' and 'Incompatible types in assignment' errors
def __delitem__(self, index: T.Union[int, slice]) -> None:
self.flush_pre_post()

@ -1205,7 +1205,7 @@ class Vs2010Backend(backends.Backend):
# Expand our object lists manually if we are on pre-Visual Studio 2015 Update 2
l = t.extract_all_objects(False)
# Unforunately, we can't use self.object_filename_from_source()
# Unfortunately, we can't use self.object_filename_from_source()
for gen in l.genlist:
for src in gen.get_outputs():
if self.environment.is_source(src) and not self.environment.is_header(src):

@ -637,7 +637,7 @@ class Target(HoldableObject):
def parse_overrides(kwargs: T.Dict[str, T.Any]) -> T.Dict[OptionKey, str]:
opts = kwargs.get('override_options', [])
# In this case we hav ean already parsed and ready to go dictionary
# In this case we have an already parsed and ready to go dictionary
# provided by typed_kwargs
if isinstance(opts, dict):
return T.cast(T.Dict[OptionKey, str], opts)

@ -61,7 +61,7 @@ TYPE_mixed = T.Union[str, int, bool, Path, BaseNode]
TYPE_mixed_list = T.Union[TYPE_mixed, T.Sequence[TYPE_mixed]]
TYPE_mixed_kwargs = T.Dict[str, TYPE_mixed_list]
# Disable all warnings automaticall enabled with --trace and friends
# Disable all warnings automatically enabled with --trace and friends
# See https://cmake.org/cmake/help/latest/variable/CMAKE_POLICY_WARNING_CMPNNNN.html
disable_policy_warnings = [
'CMP0025',

@ -1108,7 +1108,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta):
def sanity_check(self, work_dir: str, environment: 'Environment') -> None:
"""Check that this compiler actually works.
This should provide a simple compile/link test. Somthing as simple as:
This should provide a simple compile/link test. Something as simple as:
```python
main(): return 0
```

@ -248,7 +248,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
def language_stdlib_only_link_flags(self, env: 'Environment') -> T.List[str]:
# We need to apply the search prefix here, as these link arguments may
# be passed to a differen compiler with a different set of default
# be passed to a different compiler with a different set of default
# search paths, such as when using Clang for C/C++ and gfortran for
# fortran,
search_dir = self._get_search_dirs(env)
@ -262,7 +262,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
class AppleClangCPPCompiler(ClangCPPCompiler):
def language_stdlib_only_link_flags(self, env: 'Environment') -> T.List[str]:
# We need to apply the search prefix here, as these link arguments may
# be passed to a differen compiler with a different set of default
# be passed to a different compiler with a different set of default
# search paths, such as when using Clang for C/C++ and gfortran for
# fortran,
search_dir = self._get_search_dirs(env)
@ -416,7 +416,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
def language_stdlib_only_link_flags(self, env: 'Environment') -> T.List[str]:
# We need to apply the search prefix here, as these link arguments may
# be passed to a differen compiler with a different set of default
# be passed to a different compiler with a different set of default
# search paths, such as when using Clang for C/C++ and gfortran for
# fortran,
search_dir = self._get_search_dirs(env)

@ -195,7 +195,7 @@ class CudaCompiler(Compiler):
a double-quoted string a split-point. Single-quotes do not provide protection
against splitting; In fact, after splitting they are \-escaped. Unfortunately,
double-quotes don't protect against shell expansion. What follows is a
complex dance to accomodate everybody.
complex dance to accommodate everybody.
"""
SQ = "'"
@ -319,7 +319,7 @@ class CudaCompiler(Compiler):
# follow the name of the option itself by either one of more spaces or an
# equals character. When a one-character short name such as -I, -l, and -L
# is used, the value of the option may also immediately follow the option
# itself without being seperated by spaces or an equal character. The
# itself without being separated by spaces or an equal character. The
# individual values of list options may be separated by commas in a single
# instance of the option, or the option may be repeated, or any
# combination of these two cases.

@ -353,7 +353,7 @@ class DmdLikeCompilerMixin(CompilerMixinBase):
# - arguments like "-L=@rpath/xxx" without a second argument (on Apple platform)
# - arguments like "-L=/SUBSYSTEM:CONSOLE (for Windows linker)
#
# The logic that follows trys to detect all these cases (some may be missing)
# The logic that follows tries to detect all these cases (some may be missing)
# in order to prepend a -L only for the library search paths with a single -L
if arg.startswith('-L='):
@ -816,8 +816,8 @@ class LLVMDCompiler(DmdLikeCompilerMixin, DCompiler):
return ['--release']
def rsp_file_syntax(self) -> RSPFileSyntax:
# We use `mesonlib.is_windows` here because we want to konw what the
# build machine is, not the host machine. This really means whe whould
# We use `mesonlib.is_windows` here because we want to know what the
# build machine is, not the host machine. This really means we would
# have the Environment not the MachineInfo in the compiler.
return RSPFileSyntax.MSVC if is_windows() else RSPFileSyntax.GCC

@ -213,7 +213,7 @@ class GnuFortranCompiler(GnuCompiler, FortranCompiler):
def language_stdlib_only_link_flags(self, env: 'Environment') -> T.List[str]:
# We need to apply the search prefix here, as these link arguments may
# be passed to a differen compiler with a different set of default
# be passed to a different compiler with a different set of default
# search paths, such as when using Clang for C/C++ and gfortran for
# fortran,
search_dir = self._get_search_dirs(env)
@ -484,7 +484,7 @@ class FlangFortranCompiler(ClangCompiler, FortranCompiler):
def language_stdlib_only_link_flags(self, env: 'Environment') -> T.List[str]:
# We need to apply the search prefix here, as these link arguments may
# be passed to a differen compiler with a different set of default
# be passed to a different compiler with a different set of default
# search paths, such as when using Clang for C/C++ and gfortran for
# fortran,
# XXX: Untested....

@ -82,7 +82,7 @@ class ClangCompiler(GnuLikeCompiler):
def get_compiler_check_args(self, mode: CompileCheckMode) -> T.List[str]:
# Clang is different than GCC, it will return True when a symbol isn't
# defined in a header. Specifically this seems ot have something to do
# defined in a header. Specifically this seems to have something to do
# with functions that may be in a header on some systems, but not all of
# them. `strlcat` specifically with can trigger this.
myargs: T.List[str] = ['-Werror=implicit-function-declaration']
@ -119,7 +119,7 @@ class ClangCompiler(GnuLikeCompiler):
@classmethod
def use_linker_args(cls, linker: str) -> T.List[str]:
# Clang additionally can use a linker specified as a path, which GCC
# (and other gcc-like compilers) cannot. This is becuse clang (being
# (and other gcc-like compilers) cannot. This is because clang (being
# llvm based) is retargetable, while GCC is not.
#

@ -146,7 +146,7 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
return pchname
def get_pch_base_name(self, header: str) -> str:
# This needs to be implemented by inherting classes
# This needs to be implemented by inheriting classes
raise NotImplementedError
def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
@ -383,7 +383,7 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
class MSVCCompiler(VisualStudioLikeCompiler):
"""Spcific to the Microsoft Compilers."""
"""Specific to the Microsoft Compilers."""
def __init__(self, target: str):
super().__init__(target)
@ -415,7 +415,7 @@ class MSVCCompiler(VisualStudioLikeCompiler):
class ClangClCompiler(VisualStudioLikeCompiler):
"""Spcific to Clang-CL."""
"""Specific to Clang-CL."""
def __init__(self, target: str):
super().__init__(target)

@ -552,7 +552,7 @@ class CoreData:
This way everyone can do f.ex, get_option('libdir') and be sure to get
the library directory relative to prefix.
.as_posix() keeps the posix-like file seperators Meson uses.
.as_posix() keeps the posix-like file separators Meson uses.
'''
try:
value = PurePath(value)

@ -187,7 +187,7 @@ class Dependency(HoldableObject):
raise RuntimeError('Unreachable code in partial_dependency called')
def _add_sub_dependency(self, deplist: T.Iterable[T.Callable[[], 'Dependency']]) -> bool:
"""Add an internal depdency from a list of possible dependencies.
"""Add an internal dependency from a list of possible dependencies.
This method is intended to make it easier to add additional
dependencies to another dependency internally.

@ -240,7 +240,7 @@ class BoostLibraryFile():
def fix_python_name(self, tags: T.List[str]) -> T.List[str]:
# Handle the boost_python naming madeness.
# See https://github.com/mesonbuild/meson/issues/4788 for some distro
# specific naming variantions.
# specific naming variations.
other_tags = [] # type: T.List[str]
# Split the current modname into the base name and the version
@ -320,7 +320,7 @@ class BoostLibraryFile():
elif vscrt in ['/MTd', '-MTd']:
return (self.runtime_static or not self.static) and self.runtime_debug
mlog.warning(f'Boost: unknow vscrt tag {vscrt}. This may cause the compilation to fail. Please consider reporting this as a bug.', once=True)
mlog.warning(f'Boost: unknown vscrt tag {vscrt}. This may cause the compilation to fail. Please consider reporting this as a bug.', once=True)
return True
def get_compiler_args(self) -> T.List[str]:
@ -405,7 +405,7 @@ class BoostDependency(SystemDependency):
The machine file values are defaulted to the environment values.
"""
# XXX: if we had a TypedDict we woudn't need this
# XXX: if we had a TypedDict we wouldn't need this
incdir = props.get('boost_includedir')
assert incdir is None or isinstance(incdir, str)
libdir = props.get('boost_librarydir')

@ -199,7 +199,7 @@ class CudaDependency(SystemDependency):
return None
def _read_toolkit_version_txt(self, path: str) -> T.Optional[str]:
# Read 'version.txt' at the root of the CUDA Toolkit directory to determine the tookit version
# Read 'version.txt' at the root of the CUDA Toolkit directory to determine the toolkit version
version_file_path = os.path.join(path, 'version.txt')
try:
with open(version_file_path, encoding='utf-8') as version_file:

@ -63,7 +63,7 @@ class DependencyFactory:
:methods: An ordered list of DependencyMethods. This is the order
dependencies will be returned in unless they are removed by the
_process_method function
:*_name: This will overwrite the name passed to the coresponding class.
:*_name: This will overwrite the name passed to the corresponding class.
For example, if the name is 'zlib', but cmake calls the dependency
'Z', then using `cmake_name='Z'` will pass the name as 'Z' to cmake.
:*_class: A *type* or callable that creates a class, and has the

@ -432,7 +432,7 @@ class CursesSystemDependency(SystemDependency):
v_minor, _ = self.clib_compiler.get_define('PDC_VER_MINOR', f'#include <{header}>', env, [], [self])
self.version = f'{v_major}.{v_minor}'
# Check the version if possible, emit a wraning if we can't
# Check the version if possible, emit a warning if we can't
req = kwargs.get('version')
if req:
if self.version:
@ -589,7 +589,7 @@ python3_factory = DependencyFactory(
system_class=Python3DependencySystem,
# There is no version number in the macOS version number
framework_name='Python',
# There is a python in /System/Library/Frameworks, but thats python 2.x,
# There is a python in /System/Library/Frameworks, but that's python 2.x,
# Python 3 will always be in /Library
extra_kwargs={'paths': ['/Library/Frameworks']},
)

@ -113,7 +113,7 @@ class QtExtraFrameworkDependency(ExtraFrameworkDependency):
class _QtBase:
"""Mixin class for shared componenets between PkgConfig and Qmake."""
"""Mixin class for shared components between PkgConfig and Qmake."""
link_args: T.List[str]
clib_compiler: 'Compiler'
@ -239,8 +239,8 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta):
_QtBase.__init__(self, name, kwargs)
self.tools = [f'qmake-{self.qtname}', 'qmake']
# Add additional constraits that the Qt version is met, but preserve
# any version requrements the user has set as well. For exmaple, if Qt5
# Add additional constraints that the Qt version is met, but preserve
# any version requrements the user has set as well. For example, if Qt5
# is requested, add "">= 5, < 6", but if the user has ">= 5.6", don't
# lose that.
kwargs = kwargs.copy()

@ -69,7 +69,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T
# allows native builds to never need to worry about the 'BUILD_*'
# ones.
([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
# Always just the unprefixed host verions
# Always just the unprefixed host versions
[var_name]
)[for_machine]
for var in candidates:
@ -687,11 +687,11 @@ class Environment:
# time) until we're instantiating that `Compiler`
# object. This is required so that passing
# `-Dc_args=` on the command line and `$CFLAGS`
# have subtely differen behavior. `$CFLAGS` will be
# have subtely different behavior. `$CFLAGS` will be
# added to the linker command line if the compiler
# acts as a linker driver, `-Dc_args` will not.
#
# We stil use the original key as the base here, as
# We still use the original key as the base here, as
# we want to inhert the machine and the compiler
# language
key = key.evolve('env_args')

@ -1,6 +1,6 @@
# SPDX-Licnese-Identifier: Apache-2.0
# Copyright 2012-2021 The Meson development team
# Copyright © 2021 Intel Corpration
# Copyright © 2021 Intel Corporation
import enum
import functools
@ -250,7 +250,7 @@ class CompilerHolder(ObjectHolder['Compiler']):
deps = next_deps
deps = final_deps
else:
# Ensure that we alway return a new instance
# Ensure that we always return a new instance
deps = deps.copy()
return deps, self._dep_msg(deps, endl)
@ -622,7 +622,7 @@ class CompilerHolder(ObjectHolder['Compiler']):
def _has_argument_impl(self, arguments: T.Union[str, T.List[str]],
mode: _TestMode = _TestMode.COMPILER) -> bool:
"""Shared implementaiton for methods checking compiler and linker arguments."""
"""Shared implementation for methods checking compiler and linker arguments."""
# This simplifies the callers
if isinstance(arguments, str):
arguments = [arguments]

@ -424,7 +424,7 @@ class Interpreter(InterpreterBase, HoldableObject):
'''
Build a mapping of `HoldableObject` base classes to their
corresponding `ObjectHolder`s. The difference to `self.holder_map`
is that the keys here define an upper bound instead of requireing an
is that the keys here define an upper bound instead of requiring an
exact match.
The mappings defined here are only used when there was no direct hit
@ -574,7 +574,7 @@ class Interpreter(InterpreterBase, HoldableObject):
try:
# check if stable module exists
mod = self._import_module(plainname, required)
# XXX: this is acutally not helpful, since it doesn't do a version check
# XXX: this is actually not helpful, since it doesn't do a version check
mlog.warning(f'Module {modname} is now stable, please use the {plainname} module instead.')
return mod
except InvalidArguments:
@ -1039,7 +1039,7 @@ external dependencies (including libraries) must go to "dependencies".''')
self.project_default_options = mesonlib.stringlistify(kwargs.get('default_options', []))
self.project_default_options = coredata.create_options_dict(self.project_default_options, self.subproject)
# If this is the first invocation we alway sneed to initialize
# If this is the first invocation we always need to initialize
# builtins, if this is a subproject that is new in a re-invocation we
# need to initialize builtins for that
if self.environment.first_invocation or (self.subproject != '' and self.subproject not in self.coredata.initialized_subprojects):
@ -1685,7 +1685,7 @@ external dependencies (including libraries) must go to "dependencies".''')
# Set this to None to satisfy process_kwargs
kwargs['build_always'] = None
# These are are nullaable so that we can konw whether they're explicitly
# These are are nullaable so that we can know whether they're explicitly
# set or not. If they haven't been overwritten, set them to their true
# default
if kwargs['build_by_default'] is None:

@ -252,7 +252,7 @@ class EnvironmentVariablesHolder(ObjectHolder[build.EnvironmentVariables], Mutab
return repr_str.format(self.__class__.__name__, self.held_object.envvars)
def __deepcopy__(self, memo: T.Dict[str, object]) -> 'EnvironmentVariablesHolder':
# Avoid trying to copy the intepreter
# Avoid trying to copy the interpreter
return EnvironmentVariablesHolder(copy.deepcopy(self.held_object), self.interpreter)
def warn_if_has_name(self, name: str) -> None:
@ -687,7 +687,7 @@ class NullSubprojectInterpreter(HoldableObject):
# TODO: This should really be an `ObjectHolder`, but the additional stuff in this
# class prevents this. Thus, this class should be split into a pure
# `ObjectHolder` and a class specifically for stroing in `Interpreter`.
# `ObjectHolder` and a class specifically for storing in `Interpreter`.
class SubprojectHolder(MesonInterpreterObject):
def __init__(self, subinterpreter: T.Union['Interpreter', NullSubprojectInterpreter],

@ -360,7 +360,7 @@ class MesonMain(MesonInterpreterObject):
else:
# dependency('foo') without specifying static kwarg should find this
# override regardless of the static value here. But do not raise error
# if it has already been overridden, which would happend when overriding
# if it has already been overridden, which would happen when overriding
# static and shared separately:
# meson.override_dependency('foo', shared_dep, static: false)
# meson.override_dependency('foo', static_dep, static: true)

@ -82,12 +82,12 @@ def _install_mode_validator(mode: T.List[T.Union[str, bool, int]]) -> T.Optional
def _install_mode_convertor(mode: T.Optional[T.List[T.Union[str, bool, int]]]) -> FileMode:
"""Convert the DSL form of the `install_mode` keyword arugment to `FileMode`
"""Convert the DSL form of the `install_mode` keyword argument to `FileMode`
This is not required, and if not required returns None
TODO: It's not clear to me why this needs to be None and not just return an
emtpy FileMode.
empty FileMode.
"""
# this has already been validated by the validator
return FileMode(*(m if isinstance(m, str) else None for m in mode))

@ -145,7 +145,7 @@ class ObjectHolder(InterpreterObject, T.Generic[InterpreterObjectTypeVar]):
self.interpreter = interpreter
self.env = self.interpreter.environment
# Hide the object holder abstrction from the user
# Hide the object holder abstraction from the user
def display_name(self) -> str:
return type(self.held_object).__name__

@ -165,7 +165,7 @@ def typed_pos_args(name: str, *types: T.Union[T.Type, T.Tuple[T.Type, ...]],
min_varargs: int = 0, max_varargs: int = 0) -> T.Callable[..., T.Any]:
"""Decorator that types type checking of positional arguments.
This supports two different models of optional aguments, the first is the
This supports two different models of optional arguments, the first is the
variadic argument model. Variadic arguments are a possibly bounded,
possibly unbounded number of arguments of the same type (unions are
supported). The second is the standard default value model, in this case
@ -180,7 +180,7 @@ def typed_pos_args(name: str, *types: T.Union[T.Type, T.Tuple[T.Type, ...]],
:min_varargs: the minimum number of variadic arguments taken
:max_varargs: the maximum number of variadic arguments taken. 0 means unlimited
:optargs: The types of any optional arguments parameters taken. If None
then no optional paramters are taken.
then no optional parameters are taken.
Some examples of usage blow:
>>> @typed_pos_args('mod.func', str, (str, int))
@ -370,12 +370,12 @@ class KwargInfo(T.Generic[_T]):
:param convertor: A callable that converts the raw input value into a
different type. This is intended for cases such as the meson DSL using a
string, but the implementation using an Enum. This should not do
validation, just converstion.
validation, just conversion.
:param deprecated_values: a dictionary mapping a value to the version of
meson it was deprecated in.
:param since_values: a dictionary mapping a value to the version of meson it was
added in.
:param not_set_warning: A warning messsage that is logged if the kwarg is not
:param not_set_warning: A warning message that is logged if the kwarg is not
set by the user.
"""
def __init__(self, name: str,
@ -450,7 +450,7 @@ def typed_kwargs(name: str, *types: KwargInfo) -> T.Callable[..., T.Any]:
If type tyhpe is a :class:ContainerTypeInfo, then the default value will be
passed as an argument to the container initializer, making a shallow copy
:param name: the name of the function, including the object it's attached ot
:param name: the name of the function, including the object it's attached to
(if applicable)
:param *types: KwargInfo entries for each keyword argument.
"""

@ -18,7 +18,7 @@ class MesonOperator(Enum):
# Should return the boolsche interpretation of the value (`'' == false` for instance)
BOOL = 'bool()'
# Comparision
# Comparison
EQUALS = '=='
NOT_EQUALS = '!='
GREATER = '>'

@ -113,7 +113,7 @@ class StaticLinker:
be implemented
"""
assert not self.can_linker_accept_rsp(), f'{self.id} linker accepts RSP, but doesn\' provide a supported format, this is a bug'
raise EnvironmentException(f'{self.id} does not implemnt rsp format, this shouldn\'t be called')
raise EnvironmentException(f'{self.id} does not implement rsp format, this shouldn\'t be called')
class VisualStudioLikeLinker:

@ -125,7 +125,7 @@ def get_target_from_intro_data(target: ParsedTargetName, builddir: Path, introsp
if not found_targets:
raise MesonException(f'Can\'t invoke target `{target.full_name}`: target not found')
elif len(found_targets) > 1:
raise MesonException(f'Can\'t invoke target `{target.full_name}`: ambigious name. Add target type and/or path: `PATH/NAME:TYPE`')
raise MesonException(f'Can\'t invoke target `{target.full_name}`: ambiguous name. Add target type and/or path: `PATH/NAME:TYPE`')
return found_targets[0]

@ -23,7 +23,7 @@ from .. import mlog
__all__ = ['BuildDirLock']
# This needs to be inheritted by the specific implementations to make type
# This needs to be inherited by the specific implementations to make type
# checking happy
class BuildDirLock:
@ -31,7 +31,7 @@ class BuildDirLock:
self.lockfilename = os.path.join(builddir, 'meson-private/meson.lock')
def __enter__(self) -> None:
mlog.debug('Calling ther no-op version of BuildDirLock')
mlog.debug('Calling the no-op version of BuildDirLock')
def __exit__(self, *args: T.Any) -> None:
pass

@ -1731,7 +1731,7 @@ class OrderedSet(T.MutableSet[_T]):
return 'OrderedSet()'
def __reversed__(self) -> T.Iterator[_T]:
# Mypy is complaining that sets cant be reversed, which is true for
# Mypy is complaining that sets can't be reversed, which is true for
# unordered sets, but this is an ordered, set so reverse() makes sense.
return reversed(self.__container.keys()) # type: ignore

@ -174,7 +174,7 @@ def set_chmod(path: str, mode: int, dir_fd: T.Optional[int] = None,
def sanitize_permissions(path: str, umask: T.Union[str, int]) -> None:
# TODO: with python 3.8 or typing_extensions we could replace this with
# `umask: T.Union[T.Literal['preserve'], int]`, which would be mroe correct
# `umask: T.Union[T.Literal['preserve'], int]`, which would be more correct
if umask == 'preserve':
return
assert isinstance(umask, int), 'umask should only be "preserver" or an integer'

@ -265,7 +265,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
if DependencyMethods.EXTRAFRAMEWORK in methods:
nkwargs = kwargs.copy()
if mesonlib.version_compare(pkg_version, '>= 3'):
# There is a python in /System/Library/Frameworks, but thats python 2.x,
# There is a python in /System/Library/Frameworks, but that's python 2.x,
# Python 3 will always be in /Library
nkwargs['paths'] = ['/Library/Frameworks']
candidates.append(functools.partial(PythonFrameworkDependency, 'Python', env, nkwargs, installation))
@ -355,7 +355,7 @@ class PythonExternalProgram(ExternalProgram):
# We want strong key values, so we always populate this with bogus data.
# Otherwise to make the type checkers happy we'd have to do .get() for
# everycall, even though we konw that the introspection data will be
# everycall, even though we know that the introspection data will be
# complete
self.info: 'PythonIntrospectionDict' = {
'install_paths': {},
@ -634,7 +634,7 @@ class PythonModule(ExtensionModule):
missing_modules: T.List[str] = []
# FIXME: this code is *full* of sharp corners. It assumes that it's
# going to get a string value (or now a list of lenght 1), of `python2`
# going to get a string value (or now a list of length 1), of `python2`
# or `python3` which is completely nonsense. On windows the value could
# easily be `['py', '-3']`, or `['py', '-3.7']` to get a very specific
# version of python. On Linux we might want a python that's not in

@ -191,7 +191,7 @@ class QtBaseModule(ExtensionModule):
abspath = rcc_file.absolute_path(state.environment.source_dir, state.environment.build_dir)
rcc_dirname = os.path.dirname(abspath)
# FIXME: what error are we actually tring to check here?
# FIXME: what error are we actually trying to check here?
try:
tree = ET.parse(abspath)
root = tree.getroot()
@ -425,7 +425,7 @@ class QtBaseModule(ExtensionModule):
raise MesonException(err_msg.format('MOC', f'uic-qt{self.qt_version}', self.qt_version))
if not (kwargs['headers'] or kwargs['sources']):
raise build.InvalidArguments('At least one of the "headers" or "sources" keyword arguments must be provied and not empty')
raise build.InvalidArguments('At least one of the "headers" or "sources" keyword arguments must be provided and not empty')
inc = state.get_include_args(include_dirs=kwargs['include_directories'])
compile_args: T.List[str] = []
@ -448,7 +448,7 @@ class QtBaseModule(ExtensionModule):
return output
# We can't use typed_pos_args here, the signature is ambiguious
# We can't use typed_pos_args here, the signature is ambiguous
@typed_kwargs(
'qt.preprocess',
KwargInfo('sources', ContainerTypeInfo(list, (File, str)), listify=True, default=[], deprecated='0.59.0'),

@ -119,7 +119,7 @@ class ExternalProgram(mesonlib.HoldableObject):
@classmethod
def from_bin_list(cls, env: 'Environment', for_machine: MachineChoice, name: str) -> 'ExternalProgram':
# There is a static `for_machine` for this class because the binary
# aways runs on the build platform. (It's host platform is our build
# always runs on the build platform. (It's host platform is our build
# platform.) But some external programs have a target platform, so this
# is what we are specifying here.
command = env.lookup_binary_entry(for_machine, name)

@ -1,4 +1,4 @@
# Copyied from GStreamer project
# Copied from GStreamer project
# Author: Seungha Yang <seungha.yang@navercorp.com>
$i=1

@ -499,7 +499,7 @@ def fix_rpath(fname: str, rpath_dirs_to_remove: T.Set[bytes], new_rpath: T.Union
raise
# We don't look for this on import because it will do a useless PATH lookup
# on non-mac platforms. That can be expensive on some Windows machines
# (upto 30ms), which is significant with --only-changed. For details, see:
# (up to 30ms), which is significant with --only-changed. For details, see:
# https://github.com/mesonbuild/meson/pull/6612#discussion_r378581401
if INSTALL_NAME_TOOL is False:
INSTALL_NAME_TOOL = bool(shutil.which('install_name_tool'))

@ -109,7 +109,7 @@ class Node:
class PackageGenerator:
'''
Package generator for MSI pacakges
Package generator for MSI packages
'''
def __init__(self):

@ -7,7 +7,7 @@ project(
)
if meson.get_compiler('cpp').get_argument_syntax() == 'msvc'
error('MESON_SKIP_TEST: Skipp with msvc due to missing -system support')
error('MESON_SKIP_TEST: Skip with msvc due to missing -system support')
endif
cm = import('cmake')

@ -20,5 +20,5 @@ string cmModClass::getStr() const {
}
string cmModClass::getOther() const {
return "Srings:\n - " + getStrCpy() + "\n - " + getStrNext() + "\n - " + getStrCpyTest();
return "Strings:\n - " + getStrCpy() + "\n - " + getStrNext() + "\n - " + getStrCpyTest();
}

@ -50,7 +50,7 @@ foreach lang : ['c', 'cpp']
error('MESON_SKIP_TEST: Microsoft assembler (ml/armasm) not found')
endif
# Preprocess file (ml doesn't support pre-processing)
# Force the intput to be C (/Tc) because ICL otherwise assumes it's an object (.obj) file
# Force the input to be C (/Tc) because ICL otherwise assumes it's an object (.obj) file
preproc_name = lang + square_base + '.i'
square_preproc = custom_target(lang + square_impl + 'preproc',
input : square_impl,

@ -1,5 +1,5 @@
project(
'invalid C standard overriden to valid one',
'invalid C standard overridden to valid one',
'c',
default_options : ['c_std=invalid99'],
)

@ -5,6 +5,6 @@ project('dependency fallbacks', 'c')
d = dependency('libpng', 'png', 'foo')
assert(d.found())
# Check that dependency 'foo' has been implicitly overriden.
# Check that dependency 'foo' has been implicitly overridden.
d = dependency('foo')
assert(d.found())

@ -18,7 +18,7 @@ if not file_list.contains(file_a[0])
endif
if file_list.contains(file_c[0])
error('Contains with ObjectHolder lists found non existant object')
error('Contains with ObjectHolder lists found non existent object')
endif
if empty.contains('abc')

@ -73,7 +73,7 @@ endif
# test.json sets CMAKE_PREFIX_PATH to include ./cmake_pref_env/
verdep1 = dependency('cmMesonVersionedTestDep', required : true, method : 'cmake', cmake_package_version : '3.0')
verdep2 = dependency('cmMesonVersionedTestDep', required : false, method : 'cmake', cmake_package_version : '200.0')
assert(not verdep2.found(), 'found a version dep we shouldnt have')
assert(not verdep2.found(), 'found a version dep we shouldn\'t have')
# Try to compile a test that takes a dep and an include_directories

@ -1,7 +1,7 @@
project('rust linking to c using dependency', 'c', 'rust')
if host_machine.system() == 'darwin'
error('MESON_SKIP_TEST: doesnt work right on macos, please fix!')
error('MESON_SKIP_TEST: does not work right on macos, please fix!')
endif
dep_zlib = dependency('zlib', static : get_option('static'), method : get_option('method'), required : false)

@ -1,7 +1,7 @@
project('rust linking to libm', 'c', 'rust')
if host_machine.system() == 'darwin'
error('MESON_SKIP_TEST: doesnt work right on macos, please fix!')
error('MESON_SKIP_TEST: does not work right on macos, please fix!')
endif
cc = meson.get_compiler('c')

@ -1,7 +1,7 @@
project('rust shared library', 'rust')
if host_machine.system() == 'darwin'
error('MESON_SKIP_TEST: doesnt work right on macos, please fix!')
error('MESON_SKIP_TEST: does not work right on macos, please fix!')
endif
l = shared_library('stuff', 'stuff.rs', install : true)

@ -1,7 +1,7 @@
project('rust and c polyglot executable', 'c', 'rust')
if host_machine.system() == 'darwin'
error('MESON_SKIP_TEST: doesnt work right on macos, please fix!')
error('MESON_SKIP_TEST: does not work right on macos, please fix!')
endif
l = shared_library('stuff', 'stuff.rs', rust_crate_type: 'cdylib', install : true)

@ -4069,7 +4069,7 @@ class AllPlatformTests(BasePlatformTests):
def test_rust_clippy(self) -> None:
if self.backend is not Backend.ninja:
raise unittest.SkipTest('Rust is only supported with ninja currently')
# Wehn clippy is used, we should get an exception since a variable named
# When clippy is used, we should get an exception since a variable named
# "foo" is used, but is on our denylist
testdir = os.path.join(self.rust_test_dir, '1 basic')
self.init(testdir, extra_args=['--werror'], override_envvars={'RUSTC': 'clippy-driver'})

@ -1459,7 +1459,7 @@ class InternalTests(unittest.TestCase):
self.assertRaises(InvalidArguments, _, None, mock.Mock(), [], {'input': 42})
def test_detect_cpu_family(self) -> None:
"""Test the various cpu familes that we detect and normalize.
"""Test the various cpu families that we detect and normalize.
This is particularly useful as both documentation, and to keep testing
platforms that are less common.

Loading…
Cancel
Save