diff options
151 files changed, 248 insertions, 248 deletions
@@ -3,7 +3,7 @@ if ($LastExitCode -ne 0) { exit 0 } -# remove Chocolately, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it +# remove Chocolatey, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it # remove PostgreSQL from path so we don't pickup a broken zlib from it $env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey|PostgreSQL' }) -join ';' @@ -76,7 +76,7 @@ foreach ($prog in $progs) { echo "" -echo "Ninja / MSBuld version:" +echo "Ninja / MSBuild version:" if ($env:backend -eq 'ninja') { ninja --version } else { diff --git a/cross/iphone.txt b/cross/iphone.txt index 0aaed0f..943b4c8 100644 --- a/cross/iphone.txt +++ b/cross/iphone.txt @@ -1,6 +1,6 @@ # This is a cross compilation file from OSX Yosemite to iPhone # Apple keeps changing the location and names of files so -# these might not work for you. Use the googels and xcrun. +# these might not work for you. Use the googles and xcrun. [binaries] c = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk'] diff --git a/cross/tvos.txt b/cross/tvos.txt index 1ab0e7f..016a589 100644 --- a/cross/tvos.txt +++ b/cross/tvos.txt @@ -1,6 +1,6 @@ # This is a cross compilation file from OSX Yosemite to Apple tvOS # Apple keeps changing the location and names of files so -# these might not work for you. Use the googels and xcrun. +# these might not work for you. Use the googles and xcrun. [binaries] c = ['clang', '-arch', 'arm64', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk'] diff --git a/docs/markdown/Adding-new-projects-to-wrapdb.md b/docs/markdown/Adding-new-projects-to-wrapdb.md index 0e00d16..7c28b49 100644 --- a/docs/markdown/Adding-new-projects-to-wrapdb.md +++ b/docs/markdown/Adding-new-projects-to-wrapdb.md @@ -170,6 +170,6 @@ The first command is to ensure the wrap is correctly fetched from the latest packagefiles. The second command configures meson and selects a set of subprojects to enable. -The Github project contains automatic CI on pushing to run the project +The GitHub project contains automatic CI on pushing to run the project and check the metadata for obvious mistakes. This can be checked from your fork before submitting a PR. diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index b3deefc..68e943b 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -14,7 +14,7 @@ Thank you for your interest in participating to the development. ## Submitting patches All changes must be submitted as [pull requests to -Github](https://github.com/mesonbuild/meson/pulls). This causes them +GitHub](https://github.com/mesonbuild/meson/pulls). This causes them to be run through the CI system. All submissions must pass a full CI test run before they are even considered for submission. @@ -110,7 +110,7 @@ Meson's merge strategy should fulfill the following guidelines: These goals are slightly contradictory so the correct thing to do often requires some judgement on part of the person doing the -merge. Github provides three different merge options, The rules of +merge. GitHub provides three different merge options, The rules of thumb for choosing between them goes like this: - single commit pull requests should always be rebased diff --git a/docs/markdown/Fs-module.md b/docs/markdown/Fs-module.md index e18fa56..e230ec5 100644 --- a/docs/markdown/Fs-module.md +++ b/docs/markdown/Fs-module.md @@ -90,7 +90,7 @@ Examples: x = 'foo.txt' y = 'sub/../foo.txt' z = 'bar.txt' # a symlink pointing to foo.txt -j = 'notafile.txt' # non-existent file +j = 'notafile.txt' # nonexistent file fs.is_samepath(x, y) # true fs.is_samepath(x, z) # true @@ -99,7 +99,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-existent directory +s = 'notapath' # nonexistent directory fs.is_samepath(p, q) # true fs.is_samepath(p, r) # true diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md index d31606e..9c16cdb 100644 --- a/docs/markdown/IDE-integration.md +++ b/docs/markdown/IDE-integration.md @@ -260,7 +260,7 @@ The list of all _found_ dependencies can be acquired from `intro-dependencies.json`. Here, the name, version, compiler and linker arguments for a dependency are listed. -### Scanning for dependecie with `--scan-dependencies` +### Scanning for dependencies with `--scan-dependencies` It is also possible to get most dependencies used without a build directory. This can be done by running `meson introspect diff --git a/docs/markdown/MesonCI.md b/docs/markdown/MesonCI.md index 5136c28..24f3063 100644 --- a/docs/markdown/MesonCI.md +++ b/docs/markdown/MesonCI.md @@ -32,7 +32,7 @@ The Dockerfile is generated from the `image.json` file and basically only adds a few common files and runs the `install.sh` script which should contain all distribution specific setup steps. The `common.sh` can be sourced via `source /ci/common.sh` to access some shared -functionalety. +functionality. To generate the image run `build.py -t build <image>`. A generated image can be tested with `build.py -t test <image>`. diff --git a/docs/markdown/Qt6-module.md b/docs/markdown/Qt6-module.md index e7b8901..4dbf649 100644 --- a/docs/markdown/Qt6-module.md +++ b/docs/markdown/Qt6-module.md @@ -80,7 +80,7 @@ This method takes the following keyword arguments: - `ui_files`: (string | File | CustomTarget)[]: Passed the `uic` compiler - `moc_sources`: (string | File | CustomTarget)[]: Passed the `moc` compiler. These are converted into .moc files meant to be `#include`ed - - `moc_headers`: (string | File | CustomTarget)[]: Passied the `moc` compiler. + - `moc_headers`: (string | File | CustomTarget)[]: Passed the `moc` compiler. These will be converted into .cpp files - `include_directories` (IncludeDirectories | string)[], the directories to add to header search path for `moc` diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md index f63a473..a321826 100644 --- a/docs/markdown/Reference-tables.md +++ b/docs/markdown/Reference-tables.md @@ -144,7 +144,7 @@ These are provided by the `.system()` method call. | cygwin | The Cygwin environment for Windows | | darwin | Either OSX or iOS | | dragonfly | DragonFly BSD | -| emscripten | Emscripten's Javascript environment | +| emscripten | Emscripten's JavaScript environment | | freebsd | FreeBSD and its derivatives | | gnu | GNU Hurd | | haiku | | @@ -329,7 +329,7 @@ machine](#Environment-variables-per-machine) section for details. | C# | CSC | CSC | The linker is the compiler | | nasm | NASM | | Uses the C linker | -*The old environment variales are still supported, but are deprecated +*The old environment variables are still supported, but are deprecated and will be removed in a future version of Meson.* ## Environment variables per machine diff --git a/docs/markdown/Release-notes-for-0.40.0.md b/docs/markdown/Release-notes-for-0.40.0.md index 53bc9ba..5b3410b 100644 --- a/docs/markdown/Release-notes-for-0.40.0.md +++ b/docs/markdown/Release-notes-for-0.40.0.md @@ -119,7 +119,7 @@ qt5_dep = dependency('qt5', modules : 'core', method : 'qmake') ## Link whole contents of static libraries The default behavior of static libraries is to discard all symbols -that are not not directly referenced. This may lead to exported +that are not directly referenced. This may lead to exported symbols being lost. Most compilers support "whole archive" linking that includes all symbols and code of a given static library. This is exposed with the `link_whole` keyword. diff --git a/docs/markdown/Release-notes-for-0.45.0.md b/docs/markdown/Release-notes-for-0.45.0.md index 9dd56e3..1d736bb 100644 --- a/docs/markdown/Release-notes-for-0.45.0.md +++ b/docs/markdown/Release-notes-for-0.45.0.md @@ -97,7 +97,7 @@ int_255 = 0xFF The value `if-release` can be given for the `b_ndebug` project option. This will make the `NDEBUG` pre-compiler macro to be defined for -release type builds as if the `b_ndebug` project option had had the +release type builds as if the `b_ndebug` project option had the value `true` defined for it. ## `install_data()` defaults to `{datadir}/{projectname}` diff --git a/docs/markdown/Release-notes-for-0.46.0.md b/docs/markdown/Release-notes-for-0.46.0.md index 3de6bcd..f17a1b7 100644 --- a/docs/markdown/Release-notes-for-0.46.0.md +++ b/docs/markdown/Release-notes-for-0.46.0.md @@ -269,7 +269,7 @@ helper = static_library( final = shared_library( 'final', ['final.c'], - dependencyes : dep, + dependencies : dep, ) ``` diff --git a/docs/markdown/Release-notes-for-0.48.0.md b/docs/markdown/Release-notes-for-0.48.0.md index 144355d..d8dbeac 100644 --- a/docs/markdown/Release-notes-for-0.48.0.md +++ b/docs/markdown/Release-notes-for-0.48.0.md @@ -12,7 +12,7 @@ use, such as *debug* and *minsize*. There is also a *plain* type that adds nothing by default but instead makes it the user's responsibility 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. +In this release we have added 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 optimization enabled at all. If you wish to use GCC's @@ -79,7 +79,7 @@ which has special properties such as not buffering stdout and serializing all targets in this pool. The primary use-case for this is to be able to run external commands -that take a long time to exeute. Without setting this, the user does +that take a long time to execute. Without setting this, the user does not receive any feedback about what the program is doing. ## `dependency(version:)` now applies to all dependency types diff --git a/docs/markdown/Release-notes-for-0.50.0.md b/docs/markdown/Release-notes-for-0.50.0.md index 9579c33..d0f2d76 100644 --- a/docs/markdown/Release-notes-for-0.50.0.md +++ b/docs/markdown/Release-notes-for-0.50.0.md @@ -227,7 +227,7 @@ Furthermore, the `filename` and `install_filename` keys in the targets introspection are now lists of strings with identical length. The `--target-files` option is now deprecated, since the same information -can be acquired from the `--tragets` introspection API. +can be acquired from the `--targets` introspection API. ## Meson file rewriter @@ -317,7 +317,7 @@ A complete introspection dump is also stored in the `meson-info` directory. This dump will be (re)generated each time meson updates the configuration of the build directory. -Additionlly the format of `meson introspect target` was changed: +Additionally the format of `meson introspect target` was changed: - New: the `sources` key. It stores the source files of a target and their compiler parameters. - New: the `defined_in` key. It stores the Meson file where a target is defined diff --git a/docs/markdown/Release-notes-for-0.52.0.md b/docs/markdown/Release-notes-for-0.52.0.md index 5e574ba..5095d30 100644 --- a/docs/markdown/Release-notes-for-0.52.0.md +++ b/docs/markdown/Release-notes-for-0.52.0.md @@ -94,7 +94,7 @@ linker internal re-architecture this has become possible ## Compiler and dynamic linker representation split -0.52.0 includes a massive refactor of the representaitons of compilers to +0.52.0 includes a massive refactor of the representations 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. @@ -160,7 +160,7 @@ lib2 = static_library(other_sources, link_whole : lib1, install : true) ``` - `link_with:` of a static library with an uninstalled static library. In the example below, lib2 now implicitly promote `link_with:` to `link_whole:` because -the installed lib2 would oterhwise be unusable. +the installed lib2 would otherwise be unusable. ```meson lib1 = static_library(sources, install : false) lib2 = static_library(sources, link_with : lib1, install : true) diff --git a/docs/markdown/Release-notes-for-0.54.0.md b/docs/markdown/Release-notes-for-0.54.0.md index f9bfcf6..8338180 100644 --- a/docs/markdown/Release-notes-for-0.54.0.md +++ b/docs/markdown/Release-notes-for-0.54.0.md @@ -286,7 +286,7 @@ This old behavior is inconsistent with the way Autotools works, which undermines the purpose of distro-integration that is the only reason environment variables are supported at all in Meson. The new behavior is not quite the same, but doesn't conflict: Meson doesn't always -repond to an environment when Autoconf would, but when it does it +respond to an environment when Autoconf would, but when it does it interprets it as Autotools would. ## Added 'pkg_config_libdir' property diff --git a/docs/markdown/Release-notes-for-0.55.0.md b/docs/markdown/Release-notes-for-0.55.0.md index 8d3b4ba..1b086b2 100644 --- a/docs/markdown/Release-notes-for-0.55.0.md +++ b/docs/markdown/Release-notes-for-0.55.0.md @@ -93,7 +93,7 @@ Meson now supports passing configuration options to CMake and overriding certain build details extracted from the CMake subproject. The new CMake configuration options object is very similar to the -[[@cfg_data]] object object returned +[[@cfg_data]] object returned by [[configuration_data]]. It is generated by the `subproject_options` function @@ -175,7 +175,7 @@ changed), but is now deprecated. ## String concatenation in meson_options.txt It is now possible to use string concatenation (with the `+` -opperator) in the `meson_options.txt` file. This allows splitting long +operator) in the `meson_options.txt` file. This allows splitting long option descriptions. ```meson diff --git a/docs/markdown/Release-notes-for-0.59.0.md b/docs/markdown/Release-notes-for-0.59.0.md index 8a04d34..5cdffe8 100644 --- a/docs/markdown/Release-notes-for-0.59.0.md +++ b/docs/markdown/Release-notes-for-0.59.0.md @@ -196,7 +196,7 @@ executable( ## New `build target` methods The [[@build_tgt]] object now supports -the following two functions, to ensure feature compatebility with +the following two functions, to ensure feature compatibility with [[@external_program]] objects: - `found()`: Always returns `true`. This function is meant @@ -205,7 +205,7 @@ the following two functions, to ensure feature compatebility with use-cases where an executable is used instead of an external program. - `path()`: **(deprecated)** does the exact same as `full_path()`. - **NOTE:** This function is solely kept for compatebility + **NOTE:** This function is solely kept for compatibility with `external program` objects. It will be removed once the, also deprecated, corresponding `path()` function in the `external program` object is removed. diff --git a/docs/markdown/Release-notes-for-0.60.0.md b/docs/markdown/Release-notes-for-0.60.0.md index 4bf342c..2debfca 100644 --- a/docs/markdown/Release-notes-for-0.60.0.md +++ b/docs/markdown/Release-notes-for-0.60.0.md @@ -286,7 +286,7 @@ be flattened. ## The qt modules now accept generated outputs as inputs for qt.compile_* -This means you can uset `custom_target`, custom_target indices +This means you can use `custom_target`, custom_target indices (`custom_target[0]`, for example), or the output of `generator.process` as inputs to the various `qt.compile_*` methods. @@ -357,7 +357,7 @@ are found, and silently continue if Visual Studio activation fails. `meson setup --vsenv` command line argument can now be used to force Visual Studio activation even when other compilers are found. It also make Meson abort with an -error message when activation fails. This is especially useful for Github Action +error message when activation fails. This is especially useful for GitHub Actions because their Windows images have gcc in their PATH by default. `--vsenv` is set by default when using `vs` backend. diff --git a/docs/markdown/Release-notes-for-0.62.0.md b/docs/markdown/Release-notes-for-0.62.0.md index cc32ac6..9a7468f 100644 --- a/docs/markdown/Release-notes-for-0.62.0.md +++ b/docs/markdown/Release-notes-for-0.62.0.md @@ -19,9 +19,9 @@ directory, that file is loaded by gdb automatically. ## Print modified environment variables with `meson devenv --dump` -With `--dump` option, all envorinment variables that have been modified are +With `--dump` option, all environment variables that have been modified are printed instead of starting an interactive shell. It can be used by shell -scripts that wish to setup their environment themself. +scripts that wish to setup their environment themselves. ## New `method` and `separator` kwargs on `environment()` and `meson.add_devenv()` diff --git a/docs/markdown/Release-notes-for-0.63.0.md b/docs/markdown/Release-notes-for-0.63.0.md index 9f8da3e..3b47ff4 100644 --- a/docs/markdown/Release-notes-for-0.63.0.md +++ b/docs/markdown/Release-notes-for-0.63.0.md @@ -112,7 +112,7 @@ and the resulting directory tree will look like ## JAR Resources The ability to add resources to a JAR has been added. Use the `java_resources` -keyword argument. It takes a `sturctured_src` object. +keyword argument. It takes a `structured_src` object. ```meson jar( diff --git a/docs/markdown/Release-notes-for-1.0.0.md b/docs/markdown/Release-notes-for-1.0.0.md index cc29d16..42c05dd 100644 --- a/docs/markdown/Release-notes-for-1.0.0.md +++ b/docs/markdown/Release-notes-for-1.0.0.md @@ -54,7 +54,7 @@ Meson function name styling. The `bindgen` method of the `rust` module now accepts a dependencies argument. Any include paths in these dependencies will be passed to the underlying call to -`clang`, and the call to `bindgen` will correctly depend on any generatd sources. +`clang`, and the call to `bindgen` will correctly depend on any generated sources. ## String arguments to the rust.bindgen include_directories argument diff --git a/docs/markdown/Release-procedure.md b/docs/markdown/Release-procedure.md index a7ef689..4a6e7f8 100644 --- a/docs/markdown/Release-procedure.md +++ b/docs/markdown/Release-procedure.md @@ -24,7 +24,7 @@ Before a major release is made a stable branch will be made, and will be made, and all bugs effecting the RC will be assigned to this milestone. Patches fixing bugs in the milestone will be picked to the stable branch, and normal development will continue on the master -branch. Every week after after this a new release candidate will be +branch. Every week after this a new release candidate will be made until all bugs are resolved in that milestone. When all of the bugs are fixed the 0.X.0 release will be made. diff --git a/docs/markdown/Rewriter.md b/docs/markdown/Rewriter.md index 535093b..82f8635 100644 --- a/docs/markdown/Rewriter.md +++ b/docs/markdown/Rewriter.md @@ -26,7 +26,7 @@ mode", on the other hand, is meant to be used by external programs The rewriter itself is considered stable, however the user interface and the "script mode" API might change in the future. These changes -may also break backwards comaptibility to older releases. +may also break backwards compatibility to older releases. We are also open to suggestions for API improvements. diff --git a/docs/markdown/Rust-module.md b/docs/markdown/Rust-module.md index 031b62a..43dbb07 100644 --- a/docs/markdown/Rust-module.md +++ b/docs/markdown/Rust-module.md @@ -68,7 +68,7 @@ generated = rust.bindgen( ) ``` -If the header depeneds on generated headers, those headers must be passed to +If the header depends on generated headers, those headers must be passed to `bindgen` as well to ensure proper dependency ordering, static headers do not need to be passed, as a proper depfile is generated: diff --git a/docs/markdown/Simple-comparison.md b/docs/markdown/Simple-comparison.md index a8ce17b..47faa79 100644 --- a/docs/markdown/Simple-comparison.md +++ b/docs/markdown/Simple-comparison.md @@ -29,7 +29,7 @@ how much time the build system takes to check the states of all source files because if any of them could potentially cause a rebuild. Since CMake has two different backends, Make and Ninja, we ran the -tests on both of them. All tests were run on a 2011 era Macbook Pro +tests on both of them. All tests were run on a 2011 era MacBook Pro running Ubuntu 13/04. The tests were run multiple times and we always took the fastest time. diff --git a/docs/markdown/Subprojects.md b/docs/markdown/Subprojects.md index 09ff8bf..78239b9 100644 --- a/docs/markdown/Subprojects.md +++ b/docs/markdown/Subprojects.md @@ -219,7 +219,7 @@ the following command-line options: * **--wrap-mode=nodownload** Meson will not use the network to download any subprojects or - fetch any wrap information. Only pre-existing sources will be used. + fetch any wrap information. Only preexisting sources will be used. This is useful (mostly for distros) when you want to only use the sources provided by a software release, and want to manually handle or provide missing dependencies. diff --git a/docs/markdown/Syntax.md b/docs/markdown/Syntax.md index 523ee85..f63125e 100644 --- a/docs/markdown/Syntax.md +++ b/docs/markdown/Syntax.md @@ -766,7 +766,7 @@ additive_expression: multiplicative_expression | (additive_expression additive_o additive_operator: "+" | "-" argument_list: positional_arguments ["," keyword_arguments] | keyword_arguments array_literal: "[" [expression_list] "]" -assignment_statement: expression asssignment_operator expression +assignment_statement: expression assignment_operator expression assignment_operator: "=" | "+=" binary_literal: "0b" BINARY_NUMBER BINARY_NUMBER: /[01]+/ diff --git a/docs/markdown/Users.md b/docs/markdown/Users.md index 929d645..1457d12 100644 --- a/docs/markdown/Users.md +++ b/docs/markdown/Users.md @@ -107,7 +107,7 @@ format files - [Marker](https://github.com/fabiocolacio/Marker), a GTK-3 markdown editor - [Mesa](https://mesa3d.org/), an open source graphics driver project - [Miniz](https://github.com/richgel999/miniz), a zlib replacement library - - [MiracleCast](https://github.com/albfan/miraclecast), connect external monitors to your system via Wifi-Display specification aka Miracast + - [MiracleCast](https://github.com/albfan/miraclecast), connect external monitors to your system via WiFi-Display specification aka Miracast - [mpv](https://github.com/mpv-player/mpv), a free, open source, and cross-platform media player - [mrsh](https://github.com/emersion/mrsh), a minimal POSIX shell - [Nautilus](https://gitlab.gnome.org/GNOME/nautilus), the GNOME file manager diff --git a/docs/markdown/Vala.md b/docs/markdown/Vala.md index 919e305..fdc4fba 100644 --- a/docs/markdown/Vala.md +++ b/docs/markdown/Vala.md @@ -112,7 +112,7 @@ executable('app_name', sources, dependencies: dependencies) ``` Using `[GtkTemplate]` also requires the GTK+ user interface definition -files to be built in to the binary as GResources. For completeness, +files to be built into the binary as GResources. For completeness, the next example shows this: ```meson @@ -177,7 +177,7 @@ repository](https://gitlab.gnome.org/GNOME/vala-extra-vapis) is a community maintained repository of VAPIs that are not distributed. Developers use the repository to share early work on new bindings and improvements to existing bindings. So the VAPIs can frequently change. -It is recommended VAPIs from this repository are copied in to your +It is recommended VAPIs from this repository are copied into your project's source files. This also works well for starting to write new bindings before they diff --git a/docs/markdown/Windows-module.md b/docs/markdown/Windows-module.md index 3d24d76..c6d5284 100644 --- a/docs/markdown/Windows-module.md +++ b/docs/markdown/Windows-module.md @@ -20,7 +20,7 @@ Compiles Windows `rc` files specified in the positional arguments. Returns a list of `CustomTarget` objects that you put in the list of sources for the target you want to have the resources in. -*Since 0.61.0* CustomTargetIndexs and CustomTargets with more than out output +*Since 0.61.0* CustomTargetIndexes and CustomTargets with more than out output *may be used as positional arguments. This method has the following keyword arguments: diff --git a/docs/markdown/Yaml-RefMan.md b/docs/markdown/Yaml-RefMan.md index 1bb800f..2872791 100644 --- a/docs/markdown/Yaml-RefMan.md +++ b/docs/markdown/Yaml-RefMan.md @@ -34,7 +34,7 @@ To link to functions, the function name should be put into the tag: `[[<func name>]]`. Methods (for all kinds of objects, including modules) can be linked to like this: `[[<object name>.<method name>]]`. -To link to objects themself, the `[[@<object name>]]` syntax can be used. +To link to objects themselves, the `[[@<object name>]]` syntax can be used. These tags do **not** need to be put in inline code! A hotdoc extension handles the formatting here. If tags need to be placed (for instance, to include reference @@ -69,7 +69,7 @@ module has its own directory. The module itself **must** be in a file called `module.yaml`. All objects returned by the module are then located next to this file. -The name of the YAML files themself are ignored (with the exception of +The name of the YAML files themselves are ignored (with the exception of `module.yaml`) and carry no specific meaning. However, it is recommended to name the YAML files after the `name` entry of the object. @@ -81,7 +81,7 @@ is to make inheriting functions and arguments easier. # YAML schema -The YAML files themself are structured as follows: +The YAML files themselves are structured as follows: ## Functions diff --git a/docs/markdown/_include_qt_base.md b/docs/markdown/_include_qt_base.md index 46fc43a..0a11924 100644 --- a/docs/markdown/_include_qt_base.md +++ b/docs/markdown/_include_qt_base.md @@ -71,7 +71,7 @@ This method takes the following keyword arguments: - `qresources` (string | File)[]: Passed to the RCC compiler - `ui_files`: (string | File | CustomTarget)[]: Passed the `uic` compiler - `moc_sources`: (string | File | CustomTarget)[]: Passed the `moc` compiler. These are converted into .moc files meant to be `#include`ed - - `moc_headers`: (string | File | CustomTarget)[]: Passied the `moc` compiler. These will be converted into .cpp files + - `moc_headers`: (string | File | CustomTarget)[]: Passed the `moc` compiler. These will be converted into .cpp files - `include_directories` (IncludeDirectories | string)[], the directories to add to header search path for `moc` - `moc_extra_arguments` string[]: any additional arguments to `moc`. Since v0.44.0. - `uic_extra_arguments` string[]: any additional arguments to `uic`. Since v0.49.0. diff --git a/docs/markdown/i18n-module.md b/docs/markdown/i18n-module.md index a1efa5a..a939a34 100644 --- a/docs/markdown/i18n-module.md +++ b/docs/markdown/i18n-module.md @@ -27,7 +27,7 @@ argument which is the name of the gettext module. * `preset`: (*Added 0.37.0*) name of a preset list of arguments, current option is `'glib'`, see [source](https://github.com/mesonbuild/meson/blob/master/mesonbuild/modules/i18n.py) - for for their value + for their value * `install`: (*Added 0.43.0*) if false, do not install the built translations. * `install_dir`: (*Added 0.50.0*) override default install location, default is `localedir` diff --git a/docs/refman/generatormd.py b/docs/refman/generatormd.py index 6029016..87e5418 100644 --- a/docs/refman/generatormd.py +++ b/docs/refman/generatormd.py @@ -105,7 +105,7 @@ class GeneratorMD(GeneratorBase): def _link_to_object(self, obj: T.Union[Function, Object], in_code_block: bool = False) -> str: ''' - Generate a palaceholder tag for the the function/method/object documentation. + Generate a palaceholder tag for the function/method/object documentation. This tag is then replaced in the custom hotdoc plugin. ''' prefix = '#' if in_code_block else '' diff --git a/docs/refman/loaderbase.py b/docs/refman/loaderbase.py index 3011126..e64134f 100644 --- a/docs/refman/loaderbase.py +++ b/docs/refman/loaderbase.py @@ -108,7 +108,7 @@ class _Resolver: for obj in func.returns.resolved: obj.data_type.returned_by += [func] - # Handle kwargs inehritance + # Handle kwargs inheritance for base_name in func.kwargs_inherit: base_name = base_name.strip() assert base_name in self.func_map, f'Unknown base function `{base_name}` for {func.name}' @@ -123,7 +123,7 @@ class _Resolver: missing = {k: v for k, v in base.kwargs.items() if k in base_keys - curr_keys} func.kwargs.update(missing) - # Handloe other args inheritance + # Handle other args inheritance _T = T.TypeVar('_T', bound=T.Union[ArgBase, T.List[PosArg]]) def resolve_inherit(name: str, curr: _T, resolver: T.Callable[[Function], _T]) -> _T: if name and not curr: diff --git a/docs/yaml/elementary/str.yml b/docs/yaml/elementary/str.yml index 7b60e1e..00587cb 100644 --- a/docs/yaml/elementary/str.yml +++ b/docs/yaml/elementary/str.yml @@ -39,7 +39,7 @@ methods: # str.replace(old, new) - name: replace - description: Search all occurrences of `old` and and replace it with `new` + description: Search all occurrences of `old` and replace it with `new` returns: str since: 0.58.0 example: | diff --git a/docs/yaml/functions/_build_target_base.yaml b/docs/yaml/functions/_build_target_base.yaml index 767c4da..8b169c8 100644 --- a/docs/yaml/functions/_build_target_base.yaml +++ b/docs/yaml/functions/_build_target_base.yaml @@ -89,7 +89,7 @@ kwargs: default: false description: | When set to true flags this target as a GUI application - on platforms where this makes a differerence, **deprecated** since + on platforms where this makes a difference, **deprecated** since 0.56.0, use `win_subsystem` instead. link_args: @@ -299,6 +299,6 @@ kwargs: If it is a [[shared_library]] it defaults to "lib", and may be "lib", "dylib", "cdylib", or "proc-macro". If "lib" then Rustc will pick a default, "cdylib" means a C ABI library, "dylib" means a Rust ABI, and - "proc-macro" is a special rust proceedural macro crate. + "proc-macro" is a special rust procedural macro crate. "proc-macro" is new in 0.62.0. diff --git a/docs/yaml/functions/install_headers.yaml b/docs/yaml/functions/install_headers.yaml index 50e1c55..65489d2 100644 --- a/docs/yaml/functions/install_headers.yaml +++ b/docs/yaml/functions/install_headers.yaml @@ -67,6 +67,6 @@ kwargs: since: 0.63.0 default: false description: | - Disable stripping child-direcories from header files when installing. + Disable stripping child-directories from header files when installing. This is equivalent to GNU Automake's `nobase` option. diff --git a/docs/yaml/functions/project.yaml b/docs/yaml/functions/project.yaml index a18e878..59595cd 100644 --- a/docs/yaml/functions/project.yaml +++ b/docs/yaml/functions/project.yaml @@ -82,7 +82,7 @@ kwargs: For backwards compatibility reasons you can also pass an array of licenses here. This is not recommended, as it is ambiguous: `license : - ['Apache-2.0', 'GPL-2.0-only']` instead use an SPDX espression: `license + ['Apache-2.0', 'GPL-2.0-only']` instead use an SPDX expression: `license : 'Apache-2.0 OR GPL-2.0-only'`, which makes it clear that the license mean OR, not AND. diff --git a/docs/yaml/objects/build_tgt.yaml b/docs/yaml/objects/build_tgt.yaml index 6ca43f3..73b9b5d 100644 --- a/docs/yaml/objects/build_tgt.yaml +++ b/docs/yaml/objects/build_tgt.yaml @@ -53,7 +53,7 @@ methods: deprecated: 0.59.0 description: | Does the exact same as [[build_tgt.full_path]]. **NOTE**: This - function is solely kept for compatebility with [[@external_program]] objects. + function is solely kept for compatibility with [[@external_program]] objects. It will be removed once the, also deprecated, corresponding `path()` function in the [[@external_program]] object is removed. diff --git a/docs/yaml/objects/compiler.yaml b/docs/yaml/objects/compiler.yaml index abf86aa..4bf69c3 100644 --- a/docs/yaml/objects/compiler.yaml +++ b/docs/yaml/objects/compiler.yaml @@ -485,7 +485,7 @@ methods: default: "'off'" description: | Supported values: - - `'off'`: Quietely ignore unsupported arguments + - `'off'`: Quietly ignore unsupported arguments - `'warn'`: Print a warning for unsupported arguments - `'require'`: Abort if at least one argument is not supported @@ -544,7 +544,7 @@ methods: # default: "'off'" # description: | # Supported values: - # - `'off'`: Quietely ignore unsupported arguments + # - `'off'`: Quietly ignore unsupported arguments # - `'warn'`: Print a warning for unsupported arguments # - `'require'`: Abort if at least one argument is not supported diff --git a/docs/yaml/objects/module.yaml b/docs/yaml/objects/module.yaml index cd98faa..518c1aa 100644 --- a/docs/yaml/objects/module.yaml +++ b/docs/yaml/objects/module.yaml @@ -4,7 +4,7 @@ description: | Base type for all modules. Modules provide their own specific implementation methods, but all modules - proivide the following methods: + provide the following methods: methods: - name: found diff --git a/manual tests/12 wrap mirror/meson.build b/manual tests/12 wrap mirror/meson.build index 6645bdf..d299577 100644 --- a/manual tests/12 wrap mirror/meson.build +++ b/manual tests/12 wrap mirror/meson.build @@ -1,4 +1,4 @@ project('downloader') -# this test will timeout, showing that a subdomain isn't caught as masquarading url +# this test will timeout, showing that a subdomain isn't caught as masquerading url subproject('zlib') diff --git a/manual tests/3 git wrap/meson.build b/manual tests/3 git wrap/meson.build index 7fd5083..14b0671 100644 --- a/manual tests/3 git wrap/meson.build +++ b/manual tests/3 git wrap/meson.build @@ -1,4 +1,4 @@ -project('git outcheckker', 'c') +project('git outchecker', 'c') sp = subproject('samplesubproject') diff --git a/manual tests/4 standalone binaries/readme.txt b/manual tests/4 standalone binaries/readme.txt index b689779..39d21f3 100644 --- a/manual tests/4 standalone binaries/readme.txt +++ b/manual tests/4 standalone binaries/readme.txt @@ -1,5 +1,5 @@ This directory shows how you can build redistributable binaries. On -OSX this menans building an app bundle and a .dmg installer. On Linux +OSX this means building an app bundle and a .dmg installer. On Linux it means building an archive that bundles its dependencies. On Windows it means building an .exe installer. diff --git a/manual tests/6 hg wrap/meson.build b/manual tests/6 hg wrap/meson.build index c7ac004..d0e7550 100644 --- a/manual tests/6 hg wrap/meson.build +++ b/manual tests/6 hg wrap/meson.build @@ -1,4 +1,4 @@ -project('Mercurial outcheckker', 'c') +project('Mercurial outchecker', 'c') sp = subproject('samplesubproject') diff --git a/mesonbuild/arglist.py b/mesonbuild/arglist.py index 475d954..cb74d31 100644 --- a/mesonbuild/arglist.py +++ b/mesonbuild/arglist.py @@ -198,13 +198,13 @@ class CompilerArgs(T.MutableSequence[str]): """Returns whether the argument can be safely de-duped. In addition to these, we handle library arguments specially. - With GNU ld, we surround library arguments with -Wl,--start/end-gr -> Dedupoup + With GNU ld, we surround library arguments with -Wl,--start/end-group to recursively search for symbols in the libraries. This is not needed with other linkers. """ # A standalone argument must never be deduplicated because it is - # defined by what comes _after_ it. Thus dedupping this: + # defined by what comes _after_ it. Thus deduping this: # -D FOO -D BAR # would yield either # -D FOO BAR diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index 7484e04..68e2b6e 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -352,7 +352,7 @@ class AstInterpreter(InterpreterBase): return None # Loop detected id_loop_detect += [node.ast_id] - # Try to evealuate the value of the node + # Try to evaluate the value of the node if isinstance(node, IdNode): result = quick_resolve(node) @@ -421,7 +421,7 @@ class AstInterpreter(InterpreterBase): else: args = [args_raw] - flattend_args = [] # type: T.List[TYPE_nvar] + flattened_args = [] # type: T.List[TYPE_nvar] # Resolve the contents of args for i in args: @@ -430,18 +430,18 @@ class AstInterpreter(InterpreterBase): if resolved is not None: if not isinstance(resolved, list): resolved = [resolved] - flattend_args += resolved + flattened_args += resolved elif isinstance(i, (str, bool, int, float)) or include_unknown_args: - flattend_args += [i] - return flattend_args + flattened_args += [i] + return flattened_args def flatten_kwargs(self, kwargs: T.Dict[str, TYPE_nvar], include_unknown_args: bool = False) -> T.Dict[str, TYPE_nvar]: - flattend_kwargs = {} + flattened_kwargs = {} for key, val in kwargs.items(): if isinstance(val, BaseNode): resolved = self.resolve_node(val, include_unknown_args) if resolved is not None: - flattend_kwargs[key] = resolved + flattened_kwargs[key] = resolved elif isinstance(val, (str, bool, int, float)) or include_unknown_args: - flattend_kwargs[key] = val - return flattend_kwargs + flattened_kwargs[key] = val + return flattened_kwargs diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py index e811f11..3158aa2 100644 --- a/mesonbuild/ast/introspection.py +++ b/mesonbuild/ast/introspection.py @@ -263,9 +263,9 @@ class IntrospectionInterpreter(AstInterpreter): # Pop the first element if the function is a build target function if isinstance(curr, FunctionNode) and curr.func_name in BUILD_TARGET_FUNCTIONS: arg_nodes.pop(0) - elemetary_nodes = [x for x in arg_nodes if isinstance(x, (str, StringNode))] + elementary_nodes = [x for x in arg_nodes if isinstance(x, (str, StringNode))] inqueue += [x for x in arg_nodes if isinstance(x, (FunctionNode, ArrayNode, IdNode, ArithmeticNode))] - if elemetary_nodes: + if elementary_nodes: res += [curr] return res diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index d8b05b1..2522b62 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -545,7 +545,7 @@ class NinjaBackend(backends.Backend): # We want to match 'Note: including file: ' in the line # 'Note: including file: d:\MyDir\include\stdio.h', however # different locales have different messages with a different - # number of colons. Match up to the the drive name 'd:\'. + # number of colons. Match up to the drive name 'd:\'. # When used in cross compilation, the path separator is a # forward slash rather than a backslash so handle both; i.e. # the path is /MyDir/include/stdio.h. @@ -750,7 +750,7 @@ class NinjaBackend(backends.Backend): ''' Adds the source file introspection information for a language of a target - Internal introspection storage formart: + Internal introspection storage format: self.introspection_data = { '<target ID>': { <id tuple>: { @@ -830,7 +830,7 @@ class NinjaBackend(backends.Backend): self.generate_swift_target(target) return - # Pre-existing target C/C++ sources to be built; dict of full path to + # Preexisting target C/C++ sources to be built; dict of full path to # source relative to build root and the original File object. target_sources: T.MutableMapping[str, File] @@ -839,7 +839,7 @@ class NinjaBackend(backends.Backend): generated_sources: T.MutableMapping[str, File] # List of sources that have been transpiled from a DSL (like Vala) into - # a language that is haneled below, such as C or C++ + # a language that is handled below, such as C or C++ transpiled_sources: T.List[str] if 'vala' in target.compilers: @@ -879,7 +879,7 @@ class NinjaBackend(backends.Backend): mlog.log(mlog.red('FIXME'), msg) # Get a list of all generated headers that will be needed while building - # this target's sources (generated sources and pre-existing sources). + # this target's sources (generated sources and preexisting sources). # This will be set as dependencies of all the target's sources. At the # same time, also deal with generated sources that need to be compiled. generated_source_files = [] @@ -964,7 +964,7 @@ class NinjaBackend(backends.Backend): o, s = self.generate_single_compile(target, src, 'vala', [], header_deps) obj_list.append(o) - # Generate compile targets for all the pre-existing sources for this target + # Generate compile targets for all the preexisting sources for this target for src in target_sources.values(): if not self.environment.is_header(src): if self.environment.is_llvm_ir(src): @@ -1035,8 +1035,8 @@ class NinjaBackend(backends.Backend): rule_name = 'depscan' scan_sources = self.select_sources_to_scan(compiled_sources) - # Dump the sources as a json list. This avoids potential probllems where - # the number of sources passed to depscan exceedes the limit imposed by + # Dump the sources as a json list. This avoids potential problems where + # the number of sources passed to depscan exceeds the limit imposed by # the OS. with open(json_abs, 'w', encoding='utf-8') as f: json.dump(scan_sources, f) @@ -1294,7 +1294,7 @@ class NinjaBackend(backends.Backend): if build.rulename in self.ruledict: build.rule = self.ruledict[build.rulename] else: - mlog.warning(f"build statement for {build.outfilenames} references non-existent rule {build.rulename}") + mlog.warning(f"build statement for {build.outfilenames} references nonexistent rule {build.rulename}") def write_rules(self, outfile): for b in self.build_elements: @@ -1505,7 +1505,7 @@ class NinjaBackend(backends.Backend): T.Tuple[T.MutableMapping[str, File], T.MutableMapping]]: """ Splits the target's sources into .vala, .gs, .vapi, and other sources. - Handles both pre-existing and generated sources. + Handles both preexisting and generated sources. Returns a tuple (vala, vapi, others) each of which is a dictionary with the keys being the path to the file (relative to the build directory) @@ -1515,7 +1515,7 @@ class NinjaBackend(backends.Backend): vapi: T.MutableMapping[str, File] = OrderedDict() others: T.MutableMapping[str, File] = OrderedDict() othersgen: T.MutableMapping[str, File] = OrderedDict() - # Split pre-existing sources + # Split preexisting sources for s in t.get_sources(): # BuildTarget sources are always mesonlib.File files which are # either in the source root, or generated with configure_file and @@ -1928,7 +1928,7 @@ class NinjaBackend(backends.Backend): # before that it would treat linking two static libraries as # whole-archive linking. However, to make this work we have to disable # bundling, which can't be done until 1.63.0… So for 1.61–1.62 we just - # have to hope that the default cases of +whole-archive are sufficent. + # have to hope that the default cases of +whole-archive are sufficient. # See: https://github.com/rust-lang/rust/issues/99429 if mesonlib.version_compare(rustc.version, '>= 1.63.0'): whole_archive = ':+whole-archive,-bundle' @@ -2624,7 +2624,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) # has pdb file called foo.pdb. So will a static library # foo.lib, which clobbers both foo.pdb _and_ the dll file's # export library called foo.lib (by default, currently we name - # them libfoo.a to avoidt this issue). You can give the files + # them libfoo.a to avoid this issue). You can give the files # unique names such as foo_exe.pdb but VC also generates a # bunch of other files which take their names from the target # basename (i.e. "foo") and stomp on each other. diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 37d0365..86c50ec 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1436,7 +1436,7 @@ class Vs2010Backend(backends.Backend): else: inc_dirs = file_inc_dirs self.add_include_dirs(lang, inc_cl, inc_dirs) - # XXX: Do we need to set the object file name name here too? + # XXX: Do we need to set the object file name here too? previous_objects = [] if self.has_objects(objects, additional_objects, gen_objs): diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 5408b21..2f325ae 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -740,7 +740,7 @@ class BuildTarget(Target): self.rpath_dirs_to_remove: T.Set[bytes] = set() self.process_sourcelist(sources) # Objects can be: - # 1. Pre-existing objects provided by the user with the `objects:` kwarg + # 1. Preexisting objects provided by the user with the `objects:` kwarg # 2. Compiled objects created by and extracted from another target self.process_objectlist(objects) self.process_kwargs(kwargs) @@ -811,8 +811,8 @@ class BuildTarget(Target): """Split sources into generated and static sources. Sources can be: - 1. Pre-existing source files in the source tree (static) - 2. Pre-existing sources generated by configure_file in the build tree. + 1. Preexisting source files in the source tree (static) + 2. Preexisting sources generated by configure_file in the build tree. (static as they are only regenerated if meson itself is regenerated) 3. Sources files generated by another target or a Generator (generated) """ @@ -884,7 +884,7 @@ class BuildTarget(Target): missing_languages: T.List[str] = [] if not any([self.sources, self.generated, self.objects, self.structured_sources]): return missing_languages - # Pre-existing sources + # Preexisting sources sources: T.List['FileOrString'] = list(self.sources) generated = self.generated.copy() @@ -1654,7 +1654,7 @@ You probably should put it in link_with instead.''') '\n ' f'If shared_module() was used for {link_target.name} because it has references to undefined symbols,' '\n ' - 'use shared_libary() with `override_options: [\'b_lundef=false\']` instead.') + 'use shared_library() with `override_options: [\'b_lundef=false\']` instead.') link_target.force_soname = True class Generator(HoldableObject): diff --git a/mesonbuild/cmake/common.py b/mesonbuild/cmake/common.py index accb7c9..32a8c68 100644 --- a/mesonbuild/cmake/common.py +++ b/mesonbuild/cmake/common.py @@ -146,7 +146,7 @@ def cmake_defines_to_args(raw: T.Any, permissive: bool = False) -> T.List[str]: return res -# TODO: this functuin will become obsolete once the `cmake_args` kwarg is dropped +# TODO: this function will become obsolete once the `cmake_args` kwarg is dropped def check_cmake_args(args: T.List[str]) -> T.List[str]: res = [] # type: T.List[str] dis = ['-D' + x for x in blacklist_cmake_defs] diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py index 5fcba80..7f31f13 100644 --- a/mesonbuild/cmake/traceparser.py +++ b/mesonbuild/cmake/traceparser.py @@ -288,7 +288,7 @@ class CMakeTraceParser: raise CMakeException(f'CMake: {function}() {error}\n{tline}') def _cmake_set(self, tline: CMakeTraceLine) -> None: - """Handler for the CMake set() function in all variaties. + """Handler for the CMake set() function in all varieties. comes in three flavors: set(<var> <value> [PARENT_SCOPE]) @@ -509,7 +509,7 @@ class CMakeTraceParser: targets += curr.split(';') if not args: - return self._gen_exception('set_property', 'faild to parse argument list', tline) + return self._gen_exception('set_property', 'failed to parse argument list', tline) if len(args) == 1: # Tries to set property to nothing so nothing has to be done @@ -575,7 +575,7 @@ class CMakeTraceParser: targets.append(curr) - # Now we need to try to reconsitute the original quoted format of the + # Now we need to try to reconstitute the original quoted format of the # arguments, as a property value could have spaces in it. Unlike # set_property() this is not context free. There are two approaches I # can think of, both have drawbacks: @@ -586,7 +586,7 @@ class CMakeTraceParser: # # Neither of these is awesome for obvious reasons. I'm going to try # option 1 first and fall back to 2, as 1 requires less code and less - # synchroniztion for cmake changes. + # synchronization for cmake changes. # # With the JSON output format, introduced in CMake 3.17, spaces are # handled properly and we don't have to do either options diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 0feb371..5f7bfa4 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1228,7 +1228,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): mode: CompileCheckMode = CompileCheckMode.COMPILE) -> CompilerArgs: """Arguments to pass the build_wrapper helper. - This generally needs to be set on a per-language baises. It provides + This generally needs to be set on a per-language basis. It provides a hook for languages to handle dependencies and extra args. The base implementation handles the most common cases, namely adding the check_arguments, unwrapping dependencies, and appending extra args. @@ -1266,7 +1266,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): mode: str = 'compile', want_output: bool = False, disable_cache: bool = False, temp_dir: str = None) -> T.Iterator[T.Optional[CompileResult]]: - """Helper for getting a cacched value when possible. + """Helper for getting a cached value when possible. This method isn't meant to be called externally, it's mean to be wrapped by other methods like compiles() and links(). @@ -1361,7 +1361,7 @@ def get_global_options(lang: str, # If the compiler acts as a linker driver, and we're using the # environment variable flags for both the compiler and linker # arguments, then put the compiler flags in the linker flags as well. - # This is how autotools works, and the env vars freature is for + # This is how autotools works, and the env vars feature is for # autotools compatibility. largs.extend_value(comp_options) diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 6eca155..78d7fdd 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -382,7 +382,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin if 'Arm C/C++/Fortran Compiler' in out: arm_ver_match = re.search(r'version (\d+)\.(\d+)\.?(\d+)? \(build number (\d+)\)', out) - assert arm_ver_match is not None, 'for mypy' # because mypy *should* be complaning that this could be None + assert arm_ver_match is not None, 'for mypy' # because mypy *should* be complaining that this could be None version = '.'.join([x for x in arm_ver_match.groups() if x is not None]) if lang == 'c': cls = c.ArmLtdClangCCompiler @@ -667,7 +667,7 @@ def detect_fortran_compiler(env: 'Environment', for_machine: MachineChoice) -> C if 'Arm C/C++/Fortran Compiler' in out: cls = fortran.ArmLtdFlangFortranCompiler arm_ver_match = re.search(r'version (\d+)\.(\d+)\.?(\d+)? \(build number (\d+)\)', out) - assert arm_ver_match is not None, 'for mypy' # because mypy *should* be complaning that this could be None + assert arm_ver_match is not None, 'for mypy' # because mypy *should* be complaining that this could be None version = '.'.join([x for x in arm_ver_match.groups() if x is not None]) linker = guess_nix_linker(env, compiler, cls, version, for_machine) return cls( @@ -1073,7 +1073,7 @@ def detect_d_compiler(env: 'Environment', for_machine: MachineChoice) -> Compile if 'LLVM D compiler' in out: cls = d.LLVMDCompiler # LDC seems to require a file - # We cannot use NamedTemproraryFile on windows, its documented + # We cannot use NamedTemporaryFile on windows, its documented # to not work for our uses. So, just use mkstemp and only have # one path for simplicity. o, f = tempfile.mkstemp('.d') @@ -1111,7 +1111,7 @@ def detect_d_compiler(env: 'Environment', for_machine: MachineChoice) -> Compile elif 'The D Language Foundation' in out or 'Digital Mars' in out: cls = d.DmdDCompiler # DMD seems to require a file - # We cannot use NamedTemproraryFile on windows, its documented + # We cannot use NamedTemporaryFile on windows, its documented # to not work for our uses. So, just use mkstemp and only have # one path for simplicity. o, f = tempfile.mkstemp('.d') diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 8c17b5b..f8c7ebc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -16,7 +16,7 @@ from __future__ import annotations """Mixin classes to be shared between C and C++ compilers. -Without this we'll end up with awful diamond inherintance problems. The goal +Without this we'll end up with awful diamond inheritance problems. The goal of this is to have mixin's, which are classes that are designed *not* to be standalone, they only work through inheritance. """ @@ -432,7 +432,7 @@ class CLikeCompiler(Compiler): extra_args: T.Union[None, arglist.CompilerArgs, T.List[str], T.Callable[[CompileCheckMode], T.List[str]]], dependencies: T.Optional[T.List['Dependency']], mode: CompileCheckMode = CompileCheckMode.COMPILE) -> arglist.CompilerArgs: - # TODO: the caller should handle the listfing of these arguments + # TODO: the caller should handle the listing of these arguments if extra_args is None: extra_args = [] else: diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py index 12522e1..76d9829 100644 --- a/mesonbuild/compilers/mixins/visualstudio.py +++ b/mesonbuild/compilers/mixins/visualstudio.py @@ -423,7 +423,7 @@ class MSVCCompiler(VisualStudioLikeCompiler): def __init__(self, target: str): super().__init__(target) - # Visual Studio 2013 and erlier don't support the /utf-8 argument. + # Visual Studio 2013 and earlier don't support the /utf-8 argument. # We want to remove it. We also want to make an explicit copy so we # don't mutate class constant state if mesonlib.version_compare(self.version, '<19.00') and '/utf-8' in self.always_args: diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 8ddc910..c779422 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -472,7 +472,7 @@ class CoreData: # want to overwrite options for such subprojects. self.initialized_subprojects: T.Set[str] = set() - # For host == build configuraitons these caches should be the same. + # For host == build configurations these caches should be the same. self.deps: PerMachine[DependencyCache] = PerMachineDefaultable.default( self.is_cross_build(), DependencyCache(self.options, MachineChoice.BUILD), @@ -586,7 +586,7 @@ class CoreData: except TypeError: return value if option.name.endswith('dir') and value.is_absolute() and \ - option not in BULITIN_DIR_NOPREFIX_OPTIONS: + option not in BUILTIN_DIR_NOPREFIX_OPTIONS: try: # Try to relativize the path. value = value.relative_to(prefix) @@ -707,7 +707,7 @@ class CoreData: elif key.name in {'wrap_mode', 'force_fallback_for'}: # We could have the system dependency cached for a dependency that # is now forced to use subproject fallback. We probably could have - # more fine grained cache invalidation, but better be safe. + # more fine-grained cache invalidation, but better be safe. self.clear_deps_cache() dirty = True @@ -838,7 +838,7 @@ class CoreData: if pfk in options: prefix = self.sanitize_prefix(options[pfk]) dirty |= self.options[OptionKey('prefix')].set_value(prefix) - for key in BULITIN_DIR_NOPREFIX_OPTIONS: + for key in BUILTIN_DIR_NOPREFIX_OPTIONS: if key not in options: dirty |= self.options[key].set_value(BUILTIN_OPTIONS[key].prefixed_default(key, prefix)) @@ -862,7 +862,7 @@ class CoreData: def set_default_options(self, default_options: T.MutableMapping[OptionKey, str], subproject: str, env: 'Environment') -> None: # Main project can set default options on subprojects, but subprojects - # can only set default options on themself. + # can only set default options on themselves. # Preserve order: if env.options has 'buildtype' it must come after # 'optimization' if it is in default_options. options: T.MutableMapping[OptionKey, T.Any] = OrderedDict() @@ -1194,7 +1194,7 @@ class BuiltinOption(T.Generic[_T, _U]): if self.opt_type in [UserComboOption, UserIntegerOption]: return self.default try: - return BULITIN_DIR_NOPREFIX_OPTIONS[name][prefix] + return BUILTIN_DIR_NOPREFIX_OPTIONS[name][prefix] except KeyError: pass return self.default @@ -1283,7 +1283,7 @@ BUILTIN_OPTIONS_PER_MACHINE: 'MutableKeyedOptionDictType' = OrderedDict([ # Special prefix-dependent defaults for installation directories that reside in # a path outside of the prefix in FHS and common usage. -BULITIN_DIR_NOPREFIX_OPTIONS: T.Dict[OptionKey, T.Dict[str, str]] = { +BUILTIN_DIR_NOPREFIX_OPTIONS: T.Dict[OptionKey, T.Dict[str, str]] = { OptionKey('sysconfdir'): {'/usr': '/etc'}, OptionKey('localstatedir'): {'/usr': '/var', '/usr/local': '/var/local'}, OptionKey('sharedstatedir'): {'/usr': '/var/lib', '/usr/local': '/var/local/lib'}, diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 4ebd88d..44f1baf 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -80,7 +80,7 @@ if T.TYPE_CHECKING: # 2. Find all boost libraries # 2.1 Add all libraries in lib* # 2.2 Filter out non boost libraries -# 2.3 Filter the renaining libraries based on the meson requirements (static/shared, etc.) +# 2.3 Filter the remaining libraries based on the meson requirements (static/shared, etc.) # 2.4 Ensure that all libraries have the same boost tag (and are thus compatible) # 3. Select the libraries matching the requested modules @@ -243,7 +243,7 @@ class BoostLibraryFile(): return any(self.mod_name.startswith(x) for x in BoostLibraryFile.boost_python_libs) def fix_python_name(self, tags: T.List[str]) -> T.List[str]: - # Handle the boost_python naming madeness. + # Handle the boost_python naming madness. # See https://github.com/mesonbuild/meson/issues/4788 for some distro # specific naming variations. other_tags = [] # type: T.List[str] diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index abd31a1..b5ddd28 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -489,7 +489,7 @@ class CMakeDependency(ExternalDependency): libs_raw = [x for x in self.traceparser.get_cmake_var('PACKAGE_LIBRARIES') if x] # CMake has a "fun" API, where certain keywords describing - # configurations can be in the *_LIBRARIES vraiables. See: + # configurations can be in the *_LIBRARIES variables. See: # - https://github.com/mesonbuild/meson/issues/9197 # - https://gitlab.freedesktop.org/libnice/libnice/-/issues/140 # - https://cmake.org/cmake/help/latest/command/target_link_libraries.html#overview (the last point in the section) @@ -505,7 +505,7 @@ class CMakeDependency(ExternalDependency): libs += [i] # According to the CMake docs, a keyword only works for the # directly the following item and all items without a keyword - # are implizitly `general` + # are implicitly `general` cfg_matches = True # Try to use old style variables if no module is specified diff --git a/mesonbuild/dependencies/data/CMakeListsLLVM.txt b/mesonbuild/dependencies/data/CMakeListsLLVM.txt index f12dddc..4a93822 100644 --- a/mesonbuild/dependencies/data/CMakeListsLLVM.txt +++ b/mesonbuild/dependencies/data/CMakeListsLLVM.txt @@ -42,7 +42,7 @@ function(meson_llvm_cmake_dynamic_available mod out) return() endif() - # Complex heurisic to filter all pseudo-components and skip invalid names + # Complex heuristic to filter all pseudo-components and skip invalid names # LLVM_DYLIB_COMPONENTS will be 'all', because in other case we returned # in previous check. 'all' is also handled there. set(llvm_pseudo_components "native" "backend" "engine" "all-targets") diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 7b075c4..0c747c4 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -332,7 +332,7 @@ class CursesSystemDependency(SystemDependency): ('curses', ['curses.h']), ] - # Not sure how else to elegently break out of both loops + # Not sure how else to elegantly break out of both loops for lib, headers in candidates: l = self.clib_compiler.find_library(lib, env, []) if l: diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py index 2ef22e9..8dfb128 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py @@ -415,7 +415,7 @@ class PkgConfigDependency(ExternalDependency): else: variable = out.strip() - # pkg-config doesn't distinguish between empty and non-existent variables + # pkg-config doesn't distinguish between empty and nonexistent variables # use the variable list to check for variable existence if not variable: ret, out, _ = self._call_pkgbin(['--print-variables', self.name]) diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index 6dd712d..6b8c694 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -260,7 +260,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta): self.tools = [f'qmake{self.qtver}', f'qmake-{self.name}', 'qmake'] # Add additional constraints that the Qt version is met, but preserve - # any version requrements the user has set as well. For example, if Qt5 + # any version requirements 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() @@ -325,7 +325,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta): self.compile_args.append('-I' + directory) libfiles = self.clib_compiler.find_library( self.qtpkgname + module + modules_lib_suffix, self.env, - mesonlib.listify(libdir)) # TODO: shouldn't be necissary + mesonlib.listify(libdir)) # TODO: shouldn't be necessary if libfiles: libfile = libfiles[0] else: diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 90117c1..50c974b 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -28,7 +28,7 @@ from pathlib import Path # and cross file currently), and also assists with the reading environment # variables. # -# At this time there isn't an ironclad difference between this an other sources +# At this time there isn't an ironclad difference between this and other sources # of state like `coredata`. But one rough guide is much what is in `coredata` is # the *output* of the configuration process: the final decisions after tests. # This, on the other hand has *inputs*. The config files are parsed, but @@ -167,7 +167,7 @@ class Properties: return language + '_stdlib' in self.properties # Some of get_stdlib, get_root, get_sys_root are wider than is actually - # true, but without heterogenious dict annotations it's not practical to + # true, but without heterogeneous dict annotations it's not practical to # narrow them def get_stdlib(self, language: str) -> T.Union[str, T.List[str]]: stdlib = self.properties[language + '_stdlib'] diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 02a3337..ccd31eb 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -674,7 +674,7 @@ 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 different behavior. `$CFLAGS` will be + # have subtly different behavior. `$CFLAGS` will be # added to the linker command line if the compiler # acts as a linker driver, `-Dc_args` will not. # diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py index d56591b..c9ea880 100644 --- a/mesonbuild/interpreter/compiler.py +++ b/mesonbuild/interpreter/compiler.py @@ -1,4 +1,4 @@ -# SPDX-Licnese-Identifier: Apache-2.0 +# SPDX-License-Identifier: Apache-2.0 # Copyright 2012-2021 The Meson development team # Copyright © 2021 Intel Corporation from __future__ import annotations @@ -60,7 +60,7 @@ if T.TYPE_CHECKING: args: T.List[str] dependencies: T.List[dependencies.Dependency] - class CompupteIntKW(CommonKW): + class ComputeIntKW(CommonKW): guess: T.Optional[int] high: T.Optional[int] @@ -405,7 +405,7 @@ class CompilerHolder(ObjectHolder['Compiler']): KwargInfo('guess', (int, NoneType)), *_COMMON_KWS, ) - def compute_int_method(self, args: T.Tuple[str], kwargs: 'CompupteIntKW') -> int: + def compute_int_method(self, args: T.Tuple[str], kwargs: 'ComputeIntKW') -> int: expression = args[0] extra_args = functools.partial(self._determine_args, kwargs['no_builtin_args'], kwargs['include_directories'], kwargs['args']) deps, msg = self._determine_dependencies(kwargs['dependencies'], compile_only=self.compiler.is_cross) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index bbc34a4..96d4af0 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -235,7 +235,7 @@ class InterpreterRuleRelaxation(Enum): generate a Meson AST via introspection, etc. ''' - ALLOW_BUILD_DIR_FILE_REFFERENCES = 1 + ALLOW_BUILD_DIR_FILE_REFERENCES = 1 permitted_dependency_kwargs = { 'allow_fallback', @@ -1001,7 +1001,7 @@ class Interpreter(InterpreterBase, HoldableObject): # Duplicates are possible when subproject uses files from project root if build_def_files: self.build_def_files.update(build_def_files) - # We always need the subi.build_def_files, to propgate sub-sub-projects + # We always need the subi.build_def_files, to propagate sub-sub-projects self.build_def_files.update(subi.build_def_files) self.build.merge(subi.build) self.build.subprojects[subp_name] = subi.project_version @@ -1048,7 +1048,7 @@ class Interpreter(InterpreterBase, HoldableObject): [str(f) for f in cm_int.bs_files], is_translated=True, relaxations={ - InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFFERENCES, + InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFERENCES, } ) result.cm_interpreter = cm_int @@ -1365,7 +1365,7 @@ class Interpreter(InterpreterBase, HoldableObject): section, values, kwargs['bool_yn'], kwargs['list_sep'], self.subproject) def _print_summary(self) -> None: - # Add automatic 'Supbrojects' section in main project. + # Add automatic 'Subprojects' section in main project. all_subprojects = collections.OrderedDict() for name, subp in sorted(self.subprojects.items()): value = subp.found() @@ -1997,7 +1997,7 @@ class Interpreter(InterpreterBase, HoldableObject): build_by_default = kwargs['build_always'] build_always_stale = kwargs['build_by_default'] - # These are are nullaable so that we can know whether they're explicitly + # These are nullable 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 build_by_default is None: @@ -2019,9 +2019,9 @@ class Interpreter(InterpreterBase, HoldableObject): command[0] = self.find_program_impl([command[0]]) if len(inputs) > 1 and kwargs['feed']: - raise InvalidArguments('custom_target: "feed" keyword argument can only be used used with a single input') + raise InvalidArguments('custom_target: "feed" keyword argument can only be used with a single input') if len(kwargs['output']) > 1 and kwargs['capture']: - raise InvalidArguments('custom_target: "capture" keyword argument can only be used used with a single output') + raise InvalidArguments('custom_target: "capture" keyword argument can only be used with a single output') if kwargs['capture'] and kwargs['console']: raise InvalidArguments('custom_target: "capture" and "console" keyword arguments are mutually exclusive') for c in command: @@ -2370,7 +2370,7 @@ class Interpreter(InterpreterBase, HoldableObject): absname = os.path.join(self.environment.get_source_dir(), buildfilename) if not os.path.isfile(absname): self.subdir = prev_subdir - raise InterpreterException(f"Non-existent build file '{buildfilename!s}'") + raise InterpreterException(f"Nonexistent build file '{buildfilename!s}'") with open(absname, encoding='utf-8') as f: code = f.read() assert isinstance(code, str) @@ -3034,7 +3034,7 @@ class Interpreter(InterpreterBase, HoldableObject): inputtype = 'directory' else: inputtype = 'file' - if InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFFERENCES in self.relaxations and builddir in norm.parents: + if InterpreterRuleRelaxation.ALLOW_BUILD_DIR_FILE_REFERENCES in self.relaxations and builddir in norm.parents: return if srcdir not in norm.parents: # Grabbing files outside the source tree is ok. diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index fb02374..3c1cb00 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -57,7 +57,7 @@ class FuncTest(FuncBenchmark): """Keyword Arguments for `test` - `test` only adds the `is_prallel` argument over benchmark, so inherintance + `test` only adds the `is_parallel` argument over benchmark, so inheritance is helpful here. """ diff --git a/mesonbuild/interpreter/mesonmain.py b/mesonbuild/interpreter/mesonmain.py index 3e75629..2ea3163 100644 --- a/mesonbuild/interpreter/mesonmain.py +++ b/mesonbuild/interpreter/mesonmain.py @@ -377,7 +377,7 @@ class MesonMain(MesonInterpreterObject): def _override_dependency_impl(self, name: str, dep: dependencies.Dependency, kwargs: 'FuncOverrideDependency', static: T.Optional[bool], permissive: bool = False) -> None: # We need the cast here as get_dep_identifier works on such a dict, - # which FuncOverrideDependency is, but mypy can't fgure that out + # which FuncOverrideDependency is, but mypy can't figure that out nkwargs = T.cast('T.Dict[str, T.Any]', kwargs.copy()) if static is None: del nkwargs['static'] diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index e1ee82a..9b2e46c 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -87,9 +87,9 @@ def _install_mode_validator(mode: T.List[T.Union[str, bool, int]]) -> T.Optional return f'permission character 9 must be "-", "t", "T", or "x", not {perms[8]}' if len(mode) >= 2 and not isinstance(mode[1], (int, str, bool)): - return 'second componenent can only be a string, number, or False' + return 'second component can only be a string, number, or False' if len(mode) >= 3 and not isinstance(mode[2], (int, str, bool)): - return 'third componenent can only be a string, number, or False' + return 'third component can only be a string, number, or False' return None @@ -211,7 +211,7 @@ def _env_validator(value: T.Union[EnvironmentVariables, T.List['TYPE_var'], T.Di return None def _options_validator(value: T.Union[EnvironmentVariables, T.List['TYPE_var'], T.Dict[str, 'TYPE_var'], str, None]) -> T.Optional[str]: - # Reusing the env validator is a littl overkill, but nicer than duplicating the code + # Reusing the env validator is a little overkill, but nicer than duplicating the code return _env_validator(value, allow_dict_list=False) def split_equal_string(input: str) -> T.Tuple[str, str]: diff --git a/mesonbuild/interpreterbase/decorators.py b/mesonbuild/interpreterbase/decorators.py index 9defb99..3ffa67a 100644 --- a/mesonbuild/interpreterbase/decorators.py +++ b/mesonbuild/interpreterbase/decorators.py @@ -470,7 +470,7 @@ def typed_kwargs(name: str, *types: KwargInfo, allow_unknown: bool = False) -> T information. For non-required values it sets the value to a default, which means the value will always be provided. - If type tyhpe is a :class:ContainerTypeInfo, then the default value will be + If type 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 to @@ -583,7 +583,7 @@ def typed_kwargs(name: str, *types: KwargInfo, allow_unknown: bool = False) -> T else: # set the value to the default, this ensuring all kwargs are present # This both simplifies the typing checking and the usage - assert check_value_type(types_tuple, info.default), f'In funcion {name} default value of {info.name} is not a valid type, got {type(info.default)} expected {types_description(types_tuple)}' + assert check_value_type(types_tuple, info.default), f'In function {name} default value of {info.name} is not a valid type, got {type(info.default)} expected {types_description(types_tuple)}' # Create a shallow copy of the container. This allows mutable # types to be used safely as default values kwargs[info.name] = copy.copy(info.default) diff --git a/mesonbuild/interpreterbase/interpreterbase.py b/mesonbuild/interpreterbase/interpreterbase.py index b1d0779..5f854d0 100644 --- a/mesonbuild/interpreterbase/interpreterbase.py +++ b/mesonbuild/interpreterbase/interpreterbase.py @@ -525,14 +525,14 @@ class InterpreterBase: return None def method_call(self, node: mparser.MethodNode) -> T.Optional[InterpreterObject]: - invokable = node.source_object + invocable = node.source_object obj: T.Optional[InterpreterObject] - if isinstance(invokable, mparser.IdNode): - object_display_name = f'variable "{invokable.value}"' - obj = self.get_variable(invokable.value) + if isinstance(invocable, mparser.IdNode): + object_display_name = f'variable "{invocable.value}"' + obj = self.get_variable(invocable.value) else: - object_display_name = invokable.__class__.__name__ - obj = self.evaluate_statement(invokable) + object_display_name = invocable.__class__.__name__ + obj = self.evaluate_statement(invocable) method_name = node.name (h_args, h_kwargs) = self.reduce_arguments(node.args) (args, kwargs) = self._unholder_args(h_args, h_kwargs) diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py index 97e770c..59f1d78 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py @@ -96,7 +96,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty if value is not None and invoked_directly: compiler = value - # We've already hanedled the non-direct case above + # We've already handled the non-direct case above p, o, e = Popen_safe(compiler + check_args) if 'LLD' in o.split('\n', maxsplit=1)[0]: diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index 5799caf..4c00032 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -928,7 +928,7 @@ class WASMDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, Dyna class CcrxDynamicLinker(DynamicLinker): - """Linker for Renesis CCrx compiler.""" + """Linker for Renesas CCrx compiler.""" id = 'rlink' @@ -1216,7 +1216,7 @@ NvidiaHPC_StaticLinker = PGIStaticLinker class VisualStudioLikeLinkerMixin: - """Mixin class for for dynamic linkers that act like Microsoft's link.exe.""" + """Mixin class for dynamic linkers that act like Microsoft's link.exe.""" if T.TYPE_CHECKING: for_machine = MachineChoice.HOST diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py index 27e9929..91e87fa 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py @@ -207,10 +207,10 @@ def set_mode(path: str, mode: T.Optional['FileMode'], default_umask: T.Union[str except PermissionError as e: print(f'{path!r}: Unable to set owner {mode.owner!r} and group {mode.group!r}: {e.strerror}, ignoring...') except LookupError: - print(f'{path!r}: Non-existent owner {mode.owner!r} or group {mode.group!r}: ignoring...') + print(f'{path!r}: Nonexistent owner {mode.owner!r} or group {mode.group!r}: ignoring...') except OSError as e: if e.errno == errno.EINVAL: - print(f'{path!r}: Non-existent numeric owner {mode.owner!r} or group {mode.group!r}: ignoring...') + print(f'{path!r}: Nonexistent numeric owner {mode.owner!r} or group {mode.group!r}: ignoring...') else: raise # Must set permissions *after* setting owner/group otherwise the diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 019b1ea..b6577dc 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -2149,7 +2149,7 @@ class GnomeModule(ExtensionModule): ) # So to try our best to get this to just work we need: - # - link with with the correct library + # - link with the correct library # - include the vapi and dependent vapi files in sources # - add relevant directories to include dirs incs = [build.IncludeDirs(state.subdir, ['.'] + vapi_includes, False)] diff --git a/mesonbuild/modules/keyval.py b/mesonbuild/modules/keyval.py index 1ba2f1c..48afe81 100644 --- a/mesonbuild/modules/keyval.py +++ b/mesonbuild/modules/keyval.py @@ -55,7 +55,7 @@ class KeyvalModule(ExtensionModule): return result @noKwargs - @typed_pos_args('keyval.laod', (str, mesonlib.File)) + @typed_pos_args('keyval.load', (str, mesonlib.File)) def load(self, state: 'ModuleState', args: T.Tuple['mesonlib.FileOrString'], kwargs: T.Dict[str, T.Any]) -> T.Dict[str, str]: s = args[0] is_built = False diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index 494cfbf..ed1bef1 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -164,7 +164,7 @@ class WindowsModule(ExtensionModule): elif isinstance(src, build.CustomTargetIndex): FeatureNew.single_use('windows.compile_resource CustomTargetIndex in positional arguments', '0.61.0', state.subproject, location=state.current_node) - # This dance avoids a case where two indexs of the same + # This dance avoids a case where two indexes of the same # target are given as separate arguments. yield (f'{src.get_id()}_{src.target.get_outputs().index(src.output)}', f'windows_compile_resources_{src.get_filename()}', src) diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 53550b5..f7cf770 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -185,7 +185,7 @@ def returncode_to_status(retcode: int) -> str: # functions here because the status returned by subprocess is munged. It # returns a negative value if the process was killed by a signal rather than # the raw status returned by `wait()`. Also, If a shell sits between Meson - # the the actual unit test that shell is likely to convert a termination due + # the actual unit test that shell is likely to convert a termination due # to a signal into an exit status of 128 plus the signal number. if retcode < 0: signum = -retcode diff --git a/mesonbuild/programs.py b/mesonbuild/programs.py index 64f7c29..4b66698 100644 --- a/mesonbuild/programs.py +++ b/mesonbuild/programs.py @@ -354,7 +354,7 @@ class OverrideProgram(ExternalProgram): def find_external_program(env: 'Environment', for_machine: MachineChoice, name: str, display_name: str, default_names: T.List[str], allow_default_for_cross: bool = True) -> T.Generator['ExternalProgram', None, None]: - """Find an external program, chcking the cross file plus any default options.""" + """Find an external program, checking the cross file plus any default options.""" # Lookup in cross or machine file. potential_cmd = env.lookup_binary_entry(for_machine, name) if potential_cmd is not None: diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index 4c32ff1..a9b2e88 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -569,27 +569,27 @@ class Rewriter: if key not in arg_node.kwargs: arg_node.kwargs[key] = None - modifyer = kwargs_def[key](arg_node.kwargs[key]) - if not modifyer.can_modify(): + modifier = kwargs_def[key](arg_node.kwargs[key]) + if not modifier.can_modify(): mlog.log(' -- Skipping', mlog.bold(key), 'because it is to complex to modify') # Apply the operation val_str = str(val) if cmd['operation'] == 'set': mlog.log(' -- Setting', mlog.bold(key), 'to', mlog.yellow(val_str)) - modifyer.set_value(val) + modifier.set_value(val) elif cmd['operation'] == 'add': mlog.log(' -- Adding', mlog.yellow(val_str), 'to', mlog.bold(key)) - modifyer.add_value(val) + modifier.add_value(val) elif cmd['operation'] == 'remove': mlog.log(' -- Removing', mlog.yellow(val_str), 'from', mlog.bold(key)) - modifyer.remove_value(val) + modifier.remove_value(val) elif cmd['operation'] == 'remove_regex': mlog.log(' -- Removing all values matching', mlog.yellow(val_str), 'from', mlog.bold(key)) - modifyer.remove_regex(val) + modifier.remove_regex(val) # Write back the result - arg_node.kwargs[key] = modifyer.get_node() + arg_node.kwargs[key] = modifier.get_node() num_changed += 1 # Convert the keys back to IdNode's diff --git a/mesonbuild/scripts/cmake_run_ctgt.py b/mesonbuild/scripts/cmake_run_ctgt.py index a788ba5..755530a 100755 --- a/mesonbuild/scripts/cmake_run_ctgt.py +++ b/mesonbuild/scripts/cmake_run_ctgt.py @@ -35,7 +35,7 @@ def run(argsv: T.List[str]) -> int: commands += [[]] continue - i = i.replace('"', '') # Remove lefover quotes + i = i.replace('"', '') # Remove leftover quotes commands[-1] += [i] # Execute diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py index ae18594..b9c58fe 100644 --- a/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py @@ -350,7 +350,7 @@ class Elf(DataSizes): sys.exit(msg) # The linker does read-only string deduplication. If there is a # string that shares a suffix with the rpath, they might get - # dedupped. This means changing the rpath string might break something + # deduped. This means changing the rpath string might break something # completely unrelated. This has already happened once with X.org. # Thus we want to keep this change as small as possible to minimize # the chance of obliterating other strings. It might still happen diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py index e06eaaa..8c35803 100644 --- a/mesonbuild/utils/universal.py +++ b/mesonbuild/utils/universal.py @@ -2295,7 +2295,7 @@ class OptionKey: def evolve(self, name: T.Optional[str] = None, subproject: T.Optional[str] = None, machine: T.Optional[MachineChoice] = None, lang: T.Optional[str] = '', module: T.Optional[str] = '') -> 'OptionKey': - """Create a new copy of this key, but with alterted members. + """Create a new copy of this key, but with altered members. For example: >>> a = OptionKey('foo', '', MachineChoice.Host) @@ -2318,11 +2318,11 @@ class OptionKey: return self.evolve(subproject='') def as_build(self) -> 'OptionKey': - """Convenience method for key.evolve(machine=MachinceChoice.BUILD).""" + """Convenience method for key.evolve(machine=MachineChoice.BUILD).""" return self.evolve(machine=MachineChoice.BUILD) def as_host(self) -> 'OptionKey': - """Convenience method for key.evolve(machine=MachinceChoice.HOST).""" + """Convenience method for key.evolve(machine=MachineChoice.HOST).""" return self.evolve(machine=MachineChoice.HOST) def is_backend(self) -> bool: diff --git a/mesonbuild/utils/vsenv.py b/mesonbuild/utils/vsenv.py index d862e5a..3c26878 100644 --- a/mesonbuild/utils/vsenv.py +++ b/mesonbuild/utils/vsenv.py @@ -70,7 +70,7 @@ def _setup_vsenv(force: bool) -> bool: ) bat_info = json.loads(bat_json) if not bat_info: - # VS installer instelled but not VS itself maybe? + # VS installer installed but not VS itself maybe? raise MesonException('Could not parse vswhere.exe output') bat_root = pathlib.Path(bat_info[0]['installationPath']) if windows_detect_native_arch() == 'arm64': diff --git a/run_project_tests.py b/run_project_tests.py index fc9e6f9..448d559 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -153,7 +153,7 @@ class InstalledFile: if self.language in {'c', 'cpp'}: has_pdb = canonical_compiler == 'msvc' elif self.language == 'd': - # dmd's optlink does not genearte pdb iles + # dmd's optlink does not generate pdb files has_pdb = env.coredata.compilers.host['d'].linker.id in {'link', 'lld-link'} # Abort if the platform does not match diff --git a/test cases/cmake/9 disabled subproject/meson.build b/test cases/cmake/9 disabled subproject/meson.build index c153fa3..b22f959 100644 --- a/test cases/cmake/9 disabled subproject/meson.build +++ b/test cases/cmake/9 disabled subproject/meson.build @@ -2,5 +2,5 @@ project('cmakeSubTest', ['c', 'cpp']) cm = import('cmake') -sub_pro = cm.subproject('nothinig', required: false) +sub_pro = cm.subproject('nothing', required: false) assert(not sub_pro.found(), 'subproject found() reports wrong value') diff --git a/test cases/common/14 configure file/meson.build b/test cases/common/14 configure file/meson.build index 569dd09..90a468f 100644 --- a/test cases/common/14 configure file/meson.build +++ b/test cases/common/14 configure file/meson.build @@ -161,7 +161,7 @@ cfile = configure_file(input : 'config.h.in', install_dir : false, configuration : conf) -# test intsall_dir with install: false +# test install_dir with install: false cfile = configure_file(input : 'config.h.in', output : 'do_not_get_installed_in_install_dir.h', install : false, diff --git a/test cases/common/158 disabler/meson.build b/test cases/common/158 disabler/meson.build index d132e2b..65ca5fd 100644 --- a/test cases/common/158 disabler/meson.build +++ b/test cases/common/158 disabler/meson.build @@ -97,7 +97,7 @@ assert(if_is_not_disabled, 'Disabler in is_variable should not skip blocks') get_d = get_variable('d6') assert(is_disabler(get_d), 'get_variable should yield a disabler') -get_fallback_d = get_variable('nonexistant', disabler()) +get_fallback_d = get_variable('nonexistent', disabler()) assert(is_disabler(get_fallback_d), 'get_variable fallback should yield a disabler') var_true = true diff --git a/test cases/common/182 find override/meson.build b/test cases/common/182 find override/meson.build index 8dcbac7..f217001 100644 --- a/test cases/common/182 find override/meson.build +++ b/test cases/common/182 find override/meson.build @@ -18,7 +18,7 @@ assert(tool.found()) assert(tool.full_path() != '') assert(tool.full_path() == tool.path()) -# six_meson_exe is an overritten project executable +# six_meson_exe is an overridden project executable six_prog = find_program('six_meson_exe') assert(six_prog.found()) assert(six_prog.full_path() != '') diff --git a/test cases/common/189 check header/meson.build b/test cases/common/189 check header/meson.build index 98b395d..1d3eb45 100644 --- a/test cases/common/189 check header/meson.build +++ b/test cases/common/189 check header/meson.build @@ -44,5 +44,5 @@ foreach comp : [meson.get_compiler('c'), meson.get_compiler('cpp')] # This header exists in the source and the builddir, but we still must not # find it since we are looking in the system directories. assert(not comp.check_header(non_existent_header, prefix : fallback), - 'Found non-existent header.') + 'Found nonexistent header.') endforeach diff --git a/test cases/common/196 subproject with features/meson.build b/test cases/common/196 subproject with features/meson.build index 5bdfefb..130c69a 100644 --- a/test cases/common/196 subproject with features/meson.build +++ b/test cases/common/196 subproject with features/meson.build @@ -10,7 +10,7 @@ disabled_subproj = subproject('disabled_sub', required: get_option('disabled-sub assert(disabled_subproj.found() == false, 'Disabled subproject should be NOT found') disabled_dep = dependency('', fallback: ['disabled_sub', 'libSub'], required: false) -assert(disabled_dep.found() == false, 'Subprojetc was disabled, it should never be built.') +assert(disabled_dep.found() == false, 'Subproject was disabled, it should never be built.') nothing = executable('nothing', 'nothing.c', dependencies: [disabled_dep]) subproj_with_missing_dep = subproject('auto_sub_with_missing_dep', required: get_option('auto-sub-with-missing-dep')) diff --git a/test cases/common/20 global arg/prog.c b/test cases/common/20 global arg/prog.c index 2a71236..c70a669 100644 --- a/test cases/common/20 global arg/prog.c +++ b/test cases/common/20 global arg/prog.c @@ -11,7 +11,7 @@ #endif #if !defined(GLOBAL_HOST) && !defined(GLOBAL_BUILD) - #error "Neither global_host nor glogal_build is set." + #error "Neither global_host nor global_build is set." #endif #if defined(GLOBAL_HOST) && defined(GLOBAL_BUILD) diff --git a/test cases/common/220 fs module/meson.build b/test cases/common/220 fs module/meson.build index d38c872..a1e9c44 100644 --- a/test cases/common/220 fs module/meson.build +++ b/test cases/common/220 fs module/meson.build @@ -120,7 +120,7 @@ assert(not fs.is_samepath(f1, 'subdir/subdirfile.txt'), 'is_samepath known bad c assert(not fs.is_samepath('not-a-path', f2), 'is_samepath should not error if path(s) do not exist') f = files('meson.build', 'subdir/../meson.build') -assert(fs.is_samepath(f[0], f[1]), 'is_samepath not detercting same files') +assert(fs.is_samepath(f[0], f[1]), 'is_samepath not detecting same files') if not is_windows and build_machine.system() != 'cygwin' assert(fs.is_samepath(symlink, 'meson.build'), 'symlink is_samepath fail') diff --git a/test cases/common/222 native prop/meson.build b/test cases/common/222 native prop/meson.build index 8752371..88e32ec 100644 --- a/test cases/common/222 native prop/meson.build +++ b/test cases/common/222 native prop/meson.build @@ -8,16 +8,16 @@ x = meson.get_external_property('astring', native: true) assert(x=='mystring', 'did not get native property with native:true and non-cross build.') x = meson.get_external_property('astring', 'fallback', native: false) -assert(x==ref, 'did not get get native property with native:false and non-cross build.') +assert(x==ref, 'did not get native property with native:false and non-cross build.') -x = meson.get_external_property('notexist', 'fallback') +x = meson.get_external_property('nonexistent', 'fallback') assert(x=='fallback', 'fallback did not work') -x = meson.get_external_property('notexist', 'fallback', native: true) +x = meson.get_external_property('nonexistent', 'fallback', native: true) assert(x=='fallback', 'fallback native:true did not work') -x = meson.get_external_property('notexist', 'fallback', native: false) +x = meson.get_external_property('nonexistent', 'fallback', native: false) assert(x=='fallback', 'fallback native:false did not work') diff --git a/test cases/common/227 very long commmand line/codegen.py b/test cases/common/227 very long command line/codegen.py index b1de607..b1de607 100755 --- a/test cases/common/227 very long commmand line/codegen.py +++ b/test cases/common/227 very long command line/codegen.py diff --git a/test cases/common/227 very long commmand line/main.c b/test cases/common/227 very long command line/main.c index 78f2de1..78f2de1 100644 --- a/test cases/common/227 very long commmand line/main.c +++ b/test cases/common/227 very long command line/main.c diff --git a/test cases/common/227 very long commmand line/meson.build b/test cases/common/227 very long command line/meson.build index f8df311..e4661b0 100644 --- a/test cases/common/227 very long commmand line/meson.build +++ b/test cases/common/227 very long command line/meson.build @@ -8,7 +8,7 @@ if build_machine.system() == 'windows' limit = 32767 # NOTE: filename limit is 260 characters unless # 1. Python >= 3.6 is being used - # 2. Windows 10 registry has been edited to enable long pathnaems + # 2. Windows 10 registry has been edited to enable long pathnames # ninja backend uses absolute filenames, so we ensure they don't exceed 260. elif build_machine.system() == 'cygwin' # cygwin-to-win32: see above diff --git a/test cases/common/227 very long commmand line/name_gen.py b/test cases/common/227 very long command line/name_gen.py index 8435298..8435298 100755 --- a/test cases/common/227 very long commmand line/name_gen.py +++ b/test cases/common/227 very long command line/name_gen.py diff --git a/test cases/common/235 invalid standard overriden to valid/main.c b/test cases/common/235 invalid standard overridden to valid/main.c index 9b6bdc2..9b6bdc2 100644 --- a/test cases/common/235 invalid standard overriden to valid/main.c +++ b/test cases/common/235 invalid standard overridden to valid/main.c diff --git a/test cases/common/235 invalid standard overriden to valid/meson.build b/test cases/common/235 invalid standard overridden to valid/meson.build index 6dc3201..6dc3201 100644 --- a/test cases/common/235 invalid standard overriden to valid/meson.build +++ b/test cases/common/235 invalid standard overridden to valid/meson.build diff --git a/test cases/common/235 invalid standard overriden to valid/test.json b/test cases/common/235 invalid standard overridden to valid/test.json index c9b00ce..c9b00ce 100644 --- a/test cases/common/235 invalid standard overriden to valid/test.json +++ b/test cases/common/235 invalid standard overridden to valid/test.json diff --git a/test cases/common/26 find program/meson.build b/test cases/common/26 find program/meson.build index 5d38d0b..3c4d15c 100644 --- a/test cases/common/26 find program/meson.build +++ b/test cases/common/26 find program/meson.build @@ -35,5 +35,5 @@ assert(prog.found(), 'Program version should match') prog = find_program('test_subdir.py', required : false) assert(not prog.found(), 'Program should not be found') -prog = find_program('test_subdir.py', dirs : ['/donotexist', meson.current_source_dir() / 'scripts']) +prog = find_program('test_subdir.py', dirs : ['/nonexistent', meson.current_source_dir() / 'scripts']) assert(prog.found(), 'Program should be found') diff --git a/test cases/common/27 multiline string/meson.build b/test cases/common/27 multiline string/meson.build index a87d29a..39d2438 100644 --- a/test cases/common/27 multiline string/meson.build +++ b/test cases/common/27 multiline string/meson.build @@ -34,4 +34,4 @@ int main(void) { return 0; }''' -assert(cc.compiles(prog), 'multline test compile failed') +assert(cc.compiles(prog), 'multiline test compile failed') diff --git a/test cases/common/32 has header/meson.build b/test cases/common/32 has header/meson.build index 8096763..e6f6efb 100644 --- a/test cases/common/32 has header/meson.build +++ b/test cases/common/32 has header/meson.build @@ -49,6 +49,6 @@ foreach fallback : fallbacks # This header exists in the source and the builddir, but we still must not # find it since we are looking in the system directories. assert(not comp.has_header(non_existent_header, prefix : fallback), - 'Found non-existent header.') + 'Found nonexistent header.') endforeach endforeach diff --git a/test cases/common/36 has function/meson.build b/test cases/common/36 has function/meson.build index a3f0a3c..bb3e869 100644 --- a/test cases/common/36 has function/meson.build +++ b/test cases/common/36 has function/meson.build @@ -37,11 +37,11 @@ foreach cc : compilers if cc.has_function('hfkerhisadf', prefix : '#include<stdio.h>', args : unit_test_args) - error('Found non-existent function "hfkerhisadf".') + error('Found nonexistent function "hfkerhisadf".') endif if cc.has_function('hfkerhisadf', args : unit_test_args) - error('Found non-existent function "hfkerhisadf".') + error('Found nonexistent function "hfkerhisadf".') endif # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will diff --git a/test cases/common/40 options/meson_options.txt b/test cases/common/40 options/meson_options.txt index ecb024d..ad48141 100644 --- a/test cases/common/40 options/meson_options.txt +++ b/test cases/common/40 options/meson_options.txt @@ -5,7 +5,7 @@ option('array_opt', type : 'array', choices : ['one', 'two', 'three'], value : [ option('free_array_opt', type : 'array') option('integer_opt', type : 'integer', min : 0, max : -(-5), value : 3) option('neg' + '_' + 'int' + '_' + 'opt', type : 'integer', min : -5, max : 5, value : -3) -option('CaseSenSiTivE', type : 'string', value: 'Some CAPS', description : 'An option with mixed capitaliziation') +option('CaseSenSiTivE', type : 'string', value: 'Some CAPS', description : 'An option with mixed capitalization') option('CASESENSITIVE', type : 'string', value: 'ALL CAPS', description : 'An option with all caps') option('boolean_string', type : 'boolean', value : 'false') diff --git a/test cases/common/42 subproject/meson.build b/test cases/common/42 subproject/meson.build index ae68aa6..c2c0122 100644 --- a/test cases/common/42 subproject/meson.build +++ b/test cases/common/42 subproject/meson.build @@ -26,5 +26,5 @@ meson.install_dependency_manifest('share/sublib/sublib.depmf') unknown_var = sub.get_variable('does-not-exist', []) if unknown_var != [] - error ('unexpetced fallback value for subproject.get_variable()') + error ('unexpected fallback value for subproject.get_variable()') endif diff --git a/test cases/common/56 array methods/meson.build b/test cases/common/56 array methods/meson.build index d323db8..e9e4969 100644 --- a/test cases/common/56 array methods/meson.build +++ b/test cases/common/56 array methods/meson.build @@ -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 existent object') + error('Contains with ObjectHolder lists found nonexistent object') endif if empty.contains('abc') diff --git a/test cases/common/98 subproject subdir/meson.build b/test cases/common/98 subproject subdir/meson.build index 3053b3b..ef053d8 100644 --- a/test cases/common/98 subproject subdir/meson.build +++ b/test cases/common/98 subproject subdir/meson.build @@ -27,7 +27,7 @@ d = dependency('sub-notfound', fallback : 'sub_novar', required : false) assert(not d.found(), 'Dependency should be not-found') # Verify that implicit fallback works because subprojects/sub_implicit directory exists -d = dependency('sub_implicit', default_options: 'opt=overriden') +d = dependency('sub_implicit', default_options: 'opt=overridden') assert(d.found(), 'Should implicitly fallback') # Verify that implicit fallback works because sub_implicit.wrap has diff --git a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build index 9f43604..8002e9b 100644 --- a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build +++ b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build @@ -10,4 +10,4 @@ sub_implicit_provide2_dep = dep # This one is not overridden but the wrap file tells the variable name to use. glib_dep = dep -assert(get_option('opt') == 'overriden')
\ No newline at end of file +assert(get_option('opt') == 'overridden') diff --git a/test cases/failing/129 generator host binary/meson.build b/test cases/failing/129 generator host binary/meson.build index fc1f9be..e769338 100644 --- a/test cases/failing/129 generator host binary/meson.build +++ b/test cases/failing/129 generator host binary/meson.build @@ -8,7 +8,7 @@ add_languages('c', native : false) exe = executable('exe', 'exe.c', native : false) -gen = generator(exe, output : '@BASENAME@.c', arguments : ['@INPUT@', '@OUTPU@']) +gen = generator(exe, output : '@BASENAME@.c', arguments : ['@INPUT@', '@OUTPUT@']) foo = gen.process('lib.in') library('foo', foo) diff --git a/test cases/failing/3 missing subdir/test.json b/test cases/failing/3 missing subdir/test.json index 562de25..e70f6de 100644 --- a/test cases/failing/3 missing subdir/test.json +++ b/test cases/failing/3 missing subdir/test.json @@ -3,7 +3,7 @@ { "comment": "'missing/meson.build' gets transformed with os.path.sep separators", "match": "re", - "line": "test cases/failing/3 missing subdir/meson\\.build:3:0: ERROR: Non\\-existent build file 'missing[\\\\/]meson\\.build'" + "line": "test cases/failing/3 missing subdir/meson\\.build:3:0: ERROR: Nonexistent build file 'missing[\\\\/]meson\\.build'" } ] } diff --git a/test cases/failing/4 missing meson.build/test.json b/test cases/failing/4 missing meson.build/test.json index 3857090..e111087 100644 --- a/test cases/failing/4 missing meson.build/test.json +++ b/test cases/failing/4 missing meson.build/test.json @@ -3,7 +3,7 @@ { "match": "re", "comment": "'subdir/meson.build' gets transformed with os.path.sep separators", - "line": "test cases/failing/4 missing meson\\.build/meson\\.build:3:0: ERROR: Non\\-existent build file 'subdir[\\\\/]meson\\.build'" + "line": "test cases/failing/4 missing meson\\.build/meson\\.build:3:0: ERROR: Nonexistent build file 'subdir[\\\\/]meson\\.build'" } ] } diff --git a/test cases/failing/59 bad option argument/meson_options.txt b/test cases/failing/59 bad option argument/meson_options.txt index de1fff6..0e0372b 100644 --- a/test cases/failing/59 bad option argument/meson_options.txt +++ b/test cases/failing/59 bad option argument/meson_options.txt @@ -1 +1 @@ -option('name', type : 'string', vaule : 'foo') +option('name', type : 'string', value_ : 'foo') diff --git a/test cases/failing/59 bad option argument/test.json b/test cases/failing/59 bad option argument/test.json index 28aa0ca..9d22a9a 100644 --- a/test cases/failing/59 bad option argument/test.json +++ b/test cases/failing/59 bad option argument/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"vaule\"" + "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\"" } ] } diff --git a/test cases/failing/70 override used/meson.build b/test cases/failing/70 override used/meson.build index 128108e..582fc1b 100644 --- a/test cases/failing/70 override used/meson.build +++ b/test cases/failing/70 override used/meson.build @@ -1,4 +1,4 @@ -project('overridde an already found exe') +project('override an already found exe') old = find_program('something.py') replacement = find_program('other.py') diff --git a/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in index 323bec6..323bec6 100644 --- a/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in +++ b/test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in diff --git a/test cases/failing/75 non ascii in ascii encoded configure file/meson.build b/test cases/failing/75 non-ascii in ascii encoded configure file/meson.build index 26da80e..eadb627 100644 --- a/test cases/failing/75 non ascii in ascii encoded configure file/meson.build +++ b/test cases/failing/75 non-ascii in ascii encoded configure file/meson.build @@ -1,5 +1,5 @@ -project('non acsii to ascii encoding') -# Writing a non ASCII character with a ASCII encoding should fail +project('non-ascii to ascii encoding') +# Writing a non-ASCII character with a ASCII encoding should fail conf9 = configuration_data() conf9.set('var', 'д') configure_file( diff --git a/test cases/failing/75 non ascii in ascii encoded configure file/test.json b/test cases/failing/75 non-ascii in ascii encoded configure file/test.json index 27cb0ab..3d797f9 100644 --- a/test cases/failing/75 non ascii in ascii encoded configure file/test.json +++ b/test cases/failing/75 non-ascii in ascii encoded configure file/test.json @@ -2,7 +2,7 @@ "stdout": [ { "match": "re", - "line": "test cases/failing/75 non ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)" + "line": "test cases/failing/75 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)" } ] } diff --git a/test cases/failing/83 dub libray/meson.build b/test cases/failing/83 dub library/meson.build index 306d5b3..306d5b3 100644 --- a/test cases/failing/83 dub libray/meson.build +++ b/test cases/failing/83 dub library/meson.build diff --git a/test cases/failing/83 dub library/test.json b/test cases/failing/83 dub library/test.json new file mode 100644 index 0000000..e4248f4 --- /dev/null +++ b/test cases/failing/83 dub library/test.json @@ -0,0 +1,7 @@ +{ + "stdout": [ + { + "line": "test cases/failing/83 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found" + } + ] +} diff --git a/test cases/failing/83 dub libray/test.json b/test cases/failing/83 dub libray/test.json deleted file mode 100644 index 4dcbbed..0000000 --- a/test cases/failing/83 dub libray/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/failing/83 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found" - } - ] -} diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index 821bb62..2e22cbf 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -17,7 +17,7 @@ linkdep = dependency('boost', static: s, modules : ['thread', 'system', 'dat testdep = dependency('boost', static: s, modules : ['unit_test_framework']) nomoddep = dependency('boost', static: s) extralibdep = dependency('boost', static: s, modules : ['thread', 'system', 'date_time', 'log_setup', 'log', 'filesystem', 'regex']) -notfound = dependency('boost', static: s, modules : ['this_should_not_exist_on_any_systen'], required: false) +notfound = dependency('boost', static: s, modules : ['this_should_not_exist_on_any_system'], required: false) assert(not notfound.found()) diff --git a/test cases/frameworks/21 libwmf/meson.build b/test cases/frameworks/21 libwmf/meson.build index 9dbab6a..5892932 100644 --- a/test cases/frameworks/21 libwmf/meson.build +++ b/test cases/frameworks/21 libwmf/meson.build @@ -10,7 +10,7 @@ libwmf_ver = libwmf_dep.version() assert(libwmf_ver.split('.').length() > 1, 'libwmf version is "@0@"'.format(libwmf_ver)) message('libwmf version is "@0@"'.format(libwmf_ver)) # Workaround for Debian bug 912563 where libwmf-devel returns cflags -# that do not not have Freetype include paths but their headers +# that do not have Freetype include paths but their headers # use them unconditionally. ft_dep = dependency('freetype2') e = executable('libwmf_prog', 'libwmf_prog.c', dependencies : [libwmf_dep, ft_dep]) diff --git a/test cases/frameworks/25 hdf5/meson.build b/test cases/frameworks/25 hdf5/meson.build index 0df2ffd..b9f5784 100644 --- a/test cases/frameworks/25 hdf5/meson.build +++ b/test cases/frameworks/25 hdf5/meson.build @@ -29,7 +29,7 @@ if test_fortran # Search paths don't work correctly here and -lgfortran doesn't work test_fortran = false elif host_machine.system() == 'windows' and cpp.get_id() != 'gcc' and fc.get_id() == 'gcc' - # mixing gfotran with non-gcc doesn't work on windows + # mixing gfortran with non-gcc doesn't work on windows test_fortran = false endif diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index 735b3f9..66a4443 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -65,7 +65,7 @@ foreach qt : ['qt4', 'qt5', 'qt6'] extra_cpp_args = [] if meson.is_unity() extra_cpp_args += '-DUNITY_BUILD' - prep_rcc = qtmodule.preprocess(qt + '_unity_ressource', qresources : ['stuff.qrc', 'stuff2.qrc'], method : get_option('method')) + prep_rcc = qtmodule.preprocess(qt + '_unity_resource', qresources : ['stuff.qrc', 'stuff2.qrc'], method : get_option('method')) else prep_rcc = qtmodule.preprocess(qresources : ['stuff.qrc', 'stuff2.qrc'], method : get_option('method')) endif diff --git a/test cases/frameworks/4 qt/subfolder/meson.build b/test cases/frameworks/4 qt/subfolder/meson.build index f1b84e6..652d147 100644 --- a/test cases/frameworks/4 qt/subfolder/meson.build +++ b/test cases/frameworks/4 qt/subfolder/meson.build @@ -23,7 +23,7 @@ rc_file = configure_file( extra_cpp_args = [] if meson.is_unity() extra_cpp_args += '-DUNITY_BUILD' - qresources = qtmodule.preprocess(qt + '_subfolder_unity_ressource',qresources : ['resources/stuff3.qrc', rc_file]) + qresources = qtmodule.preprocess(qt + '_subfolder_unity_resource',qresources : ['resources/stuff3.qrc', rc_file]) else qresources = qtmodule.preprocess(qresources : ['resources/stuff3.qrc', rc_file]) endif diff --git a/test cases/frameworks/7 gnome/gir/copy.py b/test cases/frameworks/7 gnome/gir/copy.py index fa70145..e92deaf 100755 --- a/test cases/frameworks/7 gnome/gir/copy.py +++ b/test cases/frameworks/7 gnome/gir/copy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: Apache-2.0 -# Copyright © 2021 Intel Corproation +# Copyright © 2021 Intel Corporation import argparse import shutil diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build index fbff206..f53eca6 100644 --- a/test cases/frameworks/7 gnome/gir/meson.build +++ b/test cases/frameworks/7 gnome/gir/meson.build @@ -4,7 +4,7 @@ libsources = ['meson-sample.c', 'meson-sample.h'] lib2sources = ['meson-sample2.c', 'meson-sample2.h'] gen_source = custom_target( - 'meson_smaple3.h', + 'meson_sample3.h', input : 'meson-sample.h', output : 'meson-sample3.h', command : [find_program('copy.py'), '@INPUT@', '@OUTPUT@'], diff --git a/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake b/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake index 4b3f814..2d8318f 100644 --- a/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake +++ b/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake @@ -5,7 +5,7 @@ if(ZLIB_FOUND OR ZLIB_Found) set(cmMesonTestF1_LIBRARIES general ${ZLIB_LIBRARY}) set(cmMesonTestF1_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) - add_library(CMMesonTESTf1::evil_non_standard_trget UNKNOWN IMPORTED) + add_library(CMMesonTESTf1::evil_non_standard_target UNKNOWN IMPORTED) else() set(cmMesonTestF1_FOUND OFF) endif() diff --git a/test cases/linuxlike/13 cmake dependency/test.json b/test cases/linuxlike/13 cmake dependency/test.json index 1505986..484ce20 100644 --- a/test cases/linuxlike/13 cmake dependency/test.json +++ b/test cases/linuxlike/13 cmake dependency/test.json @@ -8,7 +8,7 @@ "line": "WARNING: Could not find and exact match for the CMake dependency cmMesonTestF1." }, { - "line": " ['CMMesonTESTf1::evil_non_standard_trget']" + "line": " ['CMMesonTESTf1::evil_non_standard_target']" } ] } diff --git a/test cases/linuxlike/5 dependency versions/meson.build b/test cases/linuxlike/5 dependency versions/meson.build index 164e679..4038ee9 100644 --- a/test cases/linuxlike/5 dependency versions/meson.build +++ b/test cases/linuxlike/5 dependency versions/meson.build @@ -82,7 +82,7 @@ assert(fakezlib_dep.type_name() == 'internal', 'fakezlib_dep should be of type " # Verify that once we got a system dependency, we won't fallback if a newer # version is requested. d = dependency('zlib', version: '>= 999', - fallback : ['donotexist', 'fakezlib_dep'], + fallback : ['nonexistent', 'fakezlib_dep'], required: false) assert(not d.found(), 'version should not match and it should not fallback') diff --git a/test cases/native/2 global arg/prog.c b/test cases/native/2 global arg/prog.c index 2a71236..c70a669 100644 --- a/test cases/native/2 global arg/prog.c +++ b/test cases/native/2 global arg/prog.c @@ -11,7 +11,7 @@ #endif #if !defined(GLOBAL_HOST) && !defined(GLOBAL_BUILD) - #error "Neither global_host nor glogal_build is set." + #error "Neither global_host nor global_build is set." #endif #if defined(GLOBAL_HOST) && defined(GLOBAL_BUILD) diff --git a/test cases/python/6 failing subproject/subprojects/bar/meson.build b/test cases/python/6 failing subproject/subprojects/bar/meson.build index 21431ca..a5534ce 100644 --- a/test cases/python/6 failing subproject/subprojects/bar/meson.build +++ b/test cases/python/6 failing subproject/subprojects/bar/meson.build @@ -1,4 +1,4 @@ project('bar', 'cpp') python = import('python').find_installation('python3') -dependency('nonexistant-dependency') +dependency('nonexistent-dependency') diff --git a/test cases/rust/19 structured sources/meson.build b/test cases/rust/19 structured sources/meson.build index d84e83f..d5b3909 100644 --- a/test cases/rust/19 structured sources/meson.build +++ b/test cases/rust/19 structured sources/meson.build @@ -27,7 +27,7 @@ target = executable( ), ) -# Should not be coppied +# Should not be copied executable( 'no_copy_target', structured_sources( diff --git a/test cases/rust/9 unit tests/test2.rs b/test cases/rust/9 unit tests/test2.rs index 9623c7c..e068605 100644 --- a/test cases/rust/9 unit tests/test2.rs +++ b/test cases/rust/9 unit tests/test2.rs @@ -3,8 +3,8 @@ use std::env; fn main() { let args: Vec<String> = env::args().collect(); - let first = args[1].parse::<i32>().expect("Invliad value for first argument."); - let second = args[2].parse::<i32>().expect("Invliad value for second argument."); + let first = args[1].parse::<i32>().expect("Invalid value for first argument."); + let second = args[2].parse::<i32>().expect("Invalid value for second argument."); let new = test::add(first, second); println!("New value: {}", new); diff --git a/test cases/unit/63 cmake parser/meson.build b/test cases/unit/63 cmake parser/meson.build index 472561d..d2a80c9 100644 --- a/test cases/unit/63 cmake parser/meson.build +++ b/test cases/unit/63 cmake parser/meson.build @@ -9,11 +9,11 @@ assert(dep.get_variable(cmake : 'VAR_WITH_SPACES') == 'With Spaces', 'set() with assert(dep.get_variable(cmake : 'VAR_WITHOUT_SPACES_PS') == 'NoSpaces', 'set(PARENT_SCOPE) without spaces incorrect') assert(dep.get_variable(cmake : 'VAR_WITH_SPACES_PS') == 'With Spaces', 'set(PARENT_SCOPE) with spaces incorrect') -assert(dep.get_variable(cmake : 'VAR_THAT_IS_UNSET', default_value : 'sentinal') == 'sentinal', 'set() to unset is incorrect') +assert(dep.get_variable(cmake : 'VAR_THAT_IS_UNSET', default_value : 'sentinel') == 'sentinel', 'set() to unset is incorrect') assert(dep.get_variable(cmake : 'CACHED_STRING_NS') == 'foo', 'set(CACHED) without spaces is incorrect') assert(dep.get_variable(cmake : 'CACHED_STRING_WS') == 'foo bar', 'set(CACHED STRING) with spaces is incorrect') assert(dep.get_variable(cmake : 'CACHED_STRING_ARRAY_NS') == 'foo;bar', 'set(CACHED STRING) without spaces is incorrect') assert(dep.get_variable(cmake : 'CACHED_STRING_ARRAY_WS') == 'foo;foo bar;bar', 'set(CACHED STRING[]) with spaces is incorrect') # We don't support this, so it should be unset. -assert(dep.get_variable(cmake : 'ENV{var}', default_value : 'sentinal') == 'sentinal', 'set(ENV) should be ignored') +assert(dep.get_variable(cmake : 'ENV{var}', default_value : 'sentinel') == 'sentinel', 'set(ENV) should be ignored') diff --git a/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c b/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c index 67261cb..fb9a9c2 100644 --- a/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c +++ b/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c @@ -1,5 +1,5 @@ /* Do not use this as the basis of your own libc. - * The code is probably unoptimal or wonky, as I + * The code is probably suboptimal or wonky, as I * had no prior experience with this, but instead * just fiddled with the code until it worked. */ diff --git a/test cases/unit/87 run native test/meson.build b/test cases/unit/87 run native test/meson.build index 3bf419c..e706dd7 100644 --- a/test cases/unit/87 run native test/meson.build +++ b/test cases/unit/87 run native test/meson.build @@ -1,6 +1,6 @@ project('run native test', ['c']) -executable('terget_exe', 'main.c') +executable('target_exe', 'main.c') native_exe = executable('native_exe', 'main.c', native: true) test('native_exe', native_exe, args: ['native_test_has_run.stamp']) diff --git a/test cases/unit/98 link full name/proguser/receiver.c b/test cases/unit/98 link full name/proguser/receiver.c index 65e9d8e..d661ae4 100644 --- a/test cases/unit/98 link full name/proguser/receiver.c +++ b/test cases/unit/98 link full name/proguser/receiver.c @@ -6,7 +6,7 @@ int __attribute__((weak)) get_checked(void) { #define CHECK_VALUE (100) #define TEST_SUCCESS (0) -#define TEST_FAILTURE (-1) +#define TEST_FAILURE (-1) int main(void) { if (get_checked() == CHECK_VALUE) { @@ -14,5 +14,5 @@ int main(void) { return TEST_SUCCESS; } fprintf(stdout,"bad\n"); - return TEST_FAILTURE; + return TEST_FAILURE; } diff --git a/tools/boost_names.py b/tools/boost_names.py index b716ccb..f27d524 100755 --- a/tools/boost_names.py +++ b/tools/boost_names.py @@ -277,12 +277,12 @@ def main() -> int: ''')) for mod in modules: - desc_excaped = re.sub(r"'", "\\'", mod.desc) + desc_escaped = re.sub(r"'", "\\'", mod.desc) print(textwrap.indent(textwrap.dedent(f"""\ '{mod.key}': BoostModule( name='{mod.name}', key='{mod.key}', - desc='{desc_excaped}', + desc='{desc_escaped}', libs={[x.name for x in mod.libs]}, ),\ """), ' ')) diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 0581caf..a8ec787 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -679,7 +679,7 @@ class AllPlatformTests(BasePlatformTests): with open(os.path.join(self.logdir, 'testlog-good.txt'), encoding='utf-8') as f: exclude_suites_log = f.read() self.assertNotIn('buggy', exclude_suites_log) - # --suite overrides add_test_setup(xclude_suites) + # --suite overrides add_test_setup(exclude_suites) self._run(self.mtest_command + ['--setup=good', '--suite', 'buggy']) with open(os.path.join(self.logdir, 'testlog-good.txt'), encoding='utf-8') as f: include_suites_log = f.read() @@ -2228,7 +2228,7 @@ class AllPlatformTests(BasePlatformTests): msg = ('''DEPRECATION: target prog links against shared module mymod, which is incorrect. This will be an error in the future, so please use shared_library() for mymod instead. If shared_module() was used for mymod because it has references to undefined symbols, - use shared_libary() with `override_options: ['b_lundef=false']` instead.''') + use shared_library() with `override_options: ['b_lundef=false']` instead.''') self.assertIn(msg, out) def test_mixed_language_linker_check(self): diff --git a/unittests/darwintests.py b/unittests/darwintests.py index 6bf15aa..254b3d0 100644 --- a/unittests/darwintests.py +++ b/unittests/darwintests.py @@ -138,7 +138,7 @@ class DarwinTests(BasePlatformTests): def test_objc_versions(self): # Objective-C always uses the C standard version. - # Objecttive-C++ always uses the C++ standard version. + # Objective-C++ always uses the C++ standard version. # This is what most people seem to want and in addition # it is the only setup supported by Xcode. testdir = os.path.join(self.objc_test_dir, '1 simple') diff --git a/unittests/internaltests.py b/unittests/internaltests.py index 28e5366..baeaacd 100644 --- a/unittests/internaltests.py +++ b/unittests/internaltests.py @@ -1101,7 +1101,7 @@ class InternalTests(unittest.TestCase): _(None, mock.Mock(), ['string', 'var', 'args', 0], None) self.assertEqual(str(cm.exception), 'foo argument 4 was of type "int" but should have been "str"') - def test_typed_pos_args_varargs_invalid_mulitple_types(self) -> None: + def test_typed_pos_args_varargs_invalid_multiple_types(self) -> None: @typed_pos_args('foo', str, varargs=(str, list)) def _(obj, node, args: T.Tuple[str, T.List[str]], kwargs) -> None: self.assertTrue(False) # should not be reachable diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py index 235d7dc..5a9c01d 100644 --- a/unittests/machinefiletests.py +++ b/unittests/machinefiletests.py @@ -140,7 +140,7 @@ class NativeFileTests(BasePlatformTests): return batfile def helper_for_compiler(self, lang, cb, for_machine = MachineChoice.HOST): - """Helper for generating tests for overriding compilers for langaugages + """Helper for generating tests for overriding compilers for languages with more than one implementation, such as C, C++, ObjC, ObjC++, and D. """ env = get_fake_env() diff --git a/unittests/rewritetests.py b/unittests/rewritetests.py index 4979c51..ca30fe9 100644 --- a/unittests/rewritetests.py +++ b/unittests/rewritetests.py @@ -156,7 +156,7 @@ class RewriterTests(BasePlatformTests): } self.assertDictEqual(out, expected) - def test_tatrget_add(self): + def test_target_add(self): self.prime('1 basic') self.rewrite(self.builddir, os.path.join(self.builddir, 'addTgt.json')) out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json')) |