Skip to content

Commit

Permalink
Fix misspells
Browse files Browse the repository at this point in the history
Signed-off-by: Antonin Décimo <antonin.decimo@gmail.com>
  • Loading branch information
MisterDA authored and eli-schwartz committed Jan 13, 2021
1 parent ccb15bc commit 39ede12
Show file tree
Hide file tree
Showing 40 changed files with 67 additions and 67 deletions.
6 changes: 3 additions & 3 deletions data/shell-completions/zsh/_meson
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ _arguments \
"$__meson_cd"
'(-n --name)'{'-n','--name'}'=[the name of the project (defaults to directory name)]'
'(-e --executable)'{'-e','--executable'}'=[the name of the executable target to create (defaults to project name)]'
'(-d --deps)'{'-d','--deps'}'=[comma seperated list of dependencies]'
'(-l --language)'{'-l','--language'}'=[comma seperated list of languages (autodetected based on sources if unset)]:languages:_values , (c cpp cs cuda d fortran java objc objcpp rust)'
'(-d --deps)'{'-d','--deps'}'=[comma separated list of dependencies]'
'(-l --language)'{'-l','--language'}'=[comma separated list of languages (autodetected based on sources if unset)]:languages:_values , (c cpp cs cuda d fortran java objc objcpp rust)'
'(-b --build)'{'-b','--build'}'[build the project immediately after generation]'
'--builddir=[directory for building]:directory:_directories'
'(-f --force)'{'-f','--force'}'[overwrite any existing files and directories]'
Expand Down Expand Up @@ -301,7 +301,7 @@ _arguments \
(( $+functions[_meson-dist] )) || _meson-dist() {
local curcontext="$curcontext"
local -a specs=(
'--formats=[comma seperated list of archive types to create]:archive formats:_values -s , format '"$__meson_dist_formats"
'--formats=[comma separated list of archive types to create]:archive formats:_values -s , format '"$__meson_dist_formats"
'--include-subprojects[Include source code of subprojects that have been used for the build]'
'--no-tests[Do not build and test generated packages]'
"$__meson_cd"
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Builtin-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Most of the time this would be used either by the parent project by setting
subproject's default_options (e.g. `subproject('foo', default_options: 'default_library=static')`),
or by the user using the command line `-Dfoo:default_library=static`.

The value is overriden in this order:
The value is overridden in this order:
- Value from parent project
- Value from subproject's default_options if set
- Value from subproject() default_options if set
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Builds a default or a specified target of a configured meson project.
- `PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`.
- `TYPE`: type of the target. Can be one of the following: 'executable', 'static_library', 'shared_library', 'shared_module', 'custom', 'run', 'jar'.

`PATH` and/or `TYPE` can be ommited if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`.
`PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`.

#### Backend specific arguments

Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ The `shared_lib` and `pdb` types takes an optional additional parameter, `versio
}
```

This will be applied appropriatly per platform. On windows this expects `lib.dll` and `lib-1.dll`. on MacOS it expects `liblib.dylib` and `liblib.1.dylib`. On other Unices it expects `liblib.so`, `liblib.so.1`, and `liblib.so.1.2.3`.
This will be applied appropriately per platform. On windows this expects `lib.dll` and `lib-1.dll`. on MacOS it expects `liblib.dylib` and `liblib.1.dylib`. On other Unices it expects `liblib.so`, `liblib.so.1`, and `liblib.so.1.2.3`.

If the `platform` key is present, the installed file entry is only considered if
the platform matches. The following values for `platform` are currently supported:
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Cross-compilation.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ project's test suite.

### Properties

In addition to the properites allowed in [all machine
In addition to the properties allowed in [all machine
files](Machine-files.md#properties), the cross file may contain specific
information about the cross compiler or the host machine. It looks like this:

Expand Down
6 changes: 3 additions & 3 deletions docs/markdown/Fs-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ fs.is_absolute('foo/bar') # false, even if ./foo/bar exists
### hash

The `fs.hash(filename, hash_algorithm)` method returns a string containing
the hexidecimal `hash_algorithm` digest of a file.
the hexadecimal `hash_algorithm` digest of a file.
`hash_algorithm` is a string; the available hash algorithms include:
md5, sha1, sha224, sha256, sha384, sha512.

Expand All @@ -84,7 +84,7 @@ Examples:
x = 'foo.txt'
y = 'sub/../foo.txt'
z = 'bar.txt' # a symlink pointing to foo.txt
j = 'notafile.txt' # non-existant file
j = 'notafile.txt' # non-existent file
fs.is_samepath(x, y) # true
fs.is_samepath(x, z) # true
Expand All @@ -93,7 +93,7 @@ fs.is_samepath(x, j) # false
p = 'foo/bar'
q = 'foo/bar/baz/..'
r = 'buz' # a symlink pointing to foo/bar
s = 'notapath' # non-existant directory
s = 'notapath' # non-existent directory
fs.is_samepath(p, q) # true
fs.is_samepath(p, r) # true
Expand Down
8 changes: 4 additions & 4 deletions docs/markdown/Machine-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,20 @@ options section.
This is a non exhaustive list of supported variables in the `[properties]`
section.

- `cmake_toolchain_file` specifies an absoulte path to an already existing
- `cmake_toolchain_file` specifies an absolute path to an already existing
CMake toolchain file that will be loaded with `include()` as the last
instruction of the automatically generated CMake toolchain file from meson.
(*new in 0.56.0*)
- `cmake_defaults` is a boolean that specifies whether meson should automatically
generate default toolchain varaibles from other sections (`binaries`,
generate default toolchain variables from other sections (`binaries`,
`host_machine`, etc.) in the machine file. Defaults are always overwritten
by variables set in the `[cmake]` section. The default is `true`. (*new in 0.56.0*)
- `cmake_skip_compiler_test` is an enum that specifies when meson should
automatically generate toolchain variables to skip the CMake compiler
sanity checks. This only has an effect if `cmake_defaults` is `true`.
Supported values are `always`, `never`, `dep_only`. The default is `dep_only`.
(*new in 0.56.0*)
- `cmake_use_exe_wrapper` is a boolean that controlls whether to use the
- `cmake_use_exe_wrapper` is a boolean that controls whether to use the
`exe_wrapper` specified in `[binaries]` to run generated executables in CMake
subprojects. This setting has no effect if the `exe_wrapper` was not specified.
The default value is `true`. (*new in 0.56.0*)
Expand All @@ -235,7 +235,7 @@ All variables set in the `[cmake]` section will be added to the generate CMake
toolchain file used for both CMake dependencies and CMake subprojects. The type
of each entry must be either a string or a list of strings.

**Note:** All occurances of `\` in the value of all keys will be replaced with
**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)
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.47.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ Project name: featurenew
Project version: undefined
Build machine cpu family: x86_64
Build machine cpu: x86_64
WARNING: Project targetting '>=0.43' but tried to use feature introduced in '0.44.0': configuration_data.get_unquoted()
WARNING: Project targeting '>=0.43' but tried to use feature introduced in '0.44.0': configuration_data.get_unquoted()
Message: bar
Build targets in project: 0
WARNING: Project specifies a minimum meson_version '>=0.43' which conflicts with:
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.48.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ that also provide a tool like protoc.
Now, by default `shared_library()` sets `-compatibility_version` and
`-current_version` of a macOS dylib using the `soversion`.

This can be overriden by using the `darwin_versions:` kwarg to
This can be overridden by using the `darwin_versions:` kwarg to
[`shared_library()`](Reference-manual.md#shared_library). As usual, you can
also pass this kwarg to `library()` or `build_target()` and it will be used in
the appropriate circumstances.
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.49.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ This allows IDE integration to get information about the project before the user
Before you could use `meson.py introspect --projectinfo build-directory`.
Now you also can use `meson.py introspect --projectinfo project-dir/meson.build`.

The output is similiar to the output with a build directory but additionally also includes information from `introspect --buildsystem-files`.
The output is similar to the output with a build directory but additionally also includes information from `introspect --buildsystem-files`.

For example `meson.py introspect --projectinfo test\ cases/common/47\ subproject\ options/meson.build`
This outputs (pretty printed for readability):
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/Release-notes-for-0.51.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ targets.
For those trying to ensure native and cross builds to the same platform produced
the same result, the old way was frustrating because very different invocations
were needed to affect the same targets, if it was possible at all. Now, the same
command line arguments affect the same targets everwhere --- Meson is closer to
command line arguments affect the same targets everywhere --- Meson is closer to
ignoring whether the "overall" build is native or cross, and just caring about
whether individual targets are for the build or host machines.

Expand Down Expand Up @@ -323,7 +323,7 @@ It should be noted that not all projects are guaranteed to work. The
safest approach would still be to create a `meson.build` for the
subprojects in question.

## Multipe cross files can be specified
## Multiple cross files can be specified

`--cross-file` can be passed multiple times, with the configuration files overlaying the same way as `--native-file`.

6 changes: 3 additions & 3 deletions docs/markdown/Release-notes-for-0.52.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Add `dependency('blocks')` to use the Clang blocks extension.

## Meson's builtin b_lundef is now supported on macOS

This has always been possible, but there are some addtional restrictions on
This has always been possible, but there are some additional restrictions on
macOS (mainly do to Apple only features). With the linker internal
re-architecture this has become possible

Expand Down Expand Up @@ -133,7 +133,7 @@ A new `version` keyword argument has been added to `find_program` to specify
the required version. See [`dependency()`](#dependency) for argument format.
The version of the program is determined by running `program_name --version`
command. If stdout is empty it fallbacks to stderr. If the output contains more
text than simply a version number, only the first occurence of numbers separated
text than simply a version number, only the first occurrence of numbers separated
by dots is kept. If the output is more complicated than that, the version
checking will have to be done manually using [`run_command()`](#run_command).

Expand Down Expand Up @@ -163,7 +163,7 @@ lib2 = static_library(sources, link_with : lib1, install : true)
```
- pkg-config generator do not include uninstalled static libraries. In the example
below, the generated `.pc` file used to be unusable because it contained
`Libs.private: -llib1` and `lib1.a` is not installed. `lib1` is now ommitted
`Libs.private: -llib1` and `lib1.a` is not installed. `lib1` is now omitted
from the `.pc` file because the `link_with:` has been promoted to
`link_whole:` (see above) and thus lib1 is not needed to use lib2.
```meson
Expand Down
6 changes: 3 additions & 3 deletions docs/markdown/Release-notes-for-0.54.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ skip_sanity_check = true
## Support for overiding 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 differnt linkers.
variable (or d_ld in the cross file) and is able to pick different linkers.

GDC supports all of the same values as GCC, LDC supports ld.bfd, ld.gold,
ld.lld, ld64, link, and lld-link.
Expand Down Expand Up @@ -249,7 +249,7 @@ Most of the time this would be used either by the parent project by setting
subproject's default_options (e.g. `subproject('foo', default_options: 'default_library=static')`),
or by the user using the command line `-Dfoo:default_library=static`.

The value is overriden in this order:
The value is overridden in this order:
- Value from parent project
- Value from subproject's default_options if set
- Value from subproject() default_options if set
Expand All @@ -276,7 +276,7 @@ and avoid a system directories use.

Meson now ships with predefined project templates for `Java`,
`Cuda`, `Objective-C++`, and `C#`, we provided with associated
values for corresponding languages, avalable for both library,
values for corresponding languages, available for both library,
and executable.

## Ninja version requirement bumped to 1.7
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Release-notes-for-0.55.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Usage: `meson compile [TARGET [TARGET...]]`
`PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`.
`TYPE`: type of the target (e.g. `shared_library`, `executable` and etc)

`PATH` and/or `TYPE` can be ommited if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`.
`PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`.

For example targets from the following code:
```meson
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Running-Meson.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ the usual way. A list of backends can be obtained with `meson setup --help`.

Sometimes you want to add extra compiler flags, this can be done by passing
them in environment variables when calling meson. See [the reference
tables](Reference-tables.md#compiler-and-linker-flag-envrionment-variables) for
tables](Reference-tables.md#compiler-and-linker-flag-environment-variables) for
a list of all the environment variables. Be aware however these environment
variables are only used for the native compiler and will not affect the
compiler used for cross-compiling, where the flags specified in the cross file
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Subprojects.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ the following command-line options:
calls, and those are meant to be used for sources that cannot be
provided by the system, such as copylibs.

This option may be overriden by `--force-fallback-for` for specific
This option may be overridden by `--force-fallback-for` for specific
dependencies.

* **--wrap-mode=forcefallback**
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/Wrap-dependency-system-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Since *0.55.0* those can be used in all wrap types, they were previously reserve
Since *0.55.0* it is possible to use only the `source_filename` and
`patch_filename` value in a .wrap file (without `source_url` and `patch_url`) to
specify a local archive in the `subprojects/packagefiles` directory. The `*_hash`
entries are optional when using this method. This method should be prefered over
entries are optional when using this method. This method should be preferred over
the old `packagecache` approach described below.

Since *0.49.0* if `source_filename` or `patch_filename` is found in the
Expand Down
10 changes: 5 additions & 5 deletions mesonbuild/arglist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -50,7 +50,7 @@ class Dedup(enum.Enum):

NO_DEDUP = 0
UNIQUE = 1
OVERRIDEN = 2
OVERRIDDEN = 2


class CompilerArgs(collections.abc.MutableSequence):
Expand Down Expand Up @@ -129,13 +129,13 @@ def flush_pre_post(self) -> None:
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
Expand Down Expand Up @@ -219,7 +219,7 @@ def _can_dedup(cls, arg: str) -> Dedup:
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 \
Expand Down
4 changes: 2 additions & 2 deletions mesonbuild/cmake/data/preload.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/cmake/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ def _all_lang_stds(self, lang: str) -> T.List[str]:
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)
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/cmake/traceparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def _cmake_add_library(self, tline: CMakeTraceLine) -> None:

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)
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/compilers/c.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def get_options(self) -> 'KeyedOptionDictType':
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',
)
Expand Down
6 changes: 3 additions & 3 deletions mesonbuild/compilers/compilers.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
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()
Expand Down Expand Up @@ -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, []))

Expand Down
Loading

0 comments on commit 39ede12

Please sign in to comment.