diff options
| author | Edward Betts <edward@4angle.com> | 2018-01-19 09:16:02 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-19 15:53:00 +0200 |
| commit | bdfcecd2c6337cc9ebc3256abadafe0d47b90a8d (patch) | |
| tree | 4e1f8f97472a765f0a5d6b9213b9f7891c18bc1b | |
| parent | a941ba219c57b49cc81338a4ff1f31e9d5cd7ee9 (diff) | |
| download | meson-bdfcecd2c6337cc9ebc3256abadafe0d47b90a8d.zip meson-bdfcecd2c6337cc9ebc3256abadafe0d47b90a8d.tar.gz meson-bdfcecd2c6337cc9ebc3256abadafe0d47b90a8d.tar.bz2 | |
Correct spelling mistakes.
| -rw-r--r-- | docs/markdown/Contributing.md | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/base.py | 4 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 2 | ||||
| -rw-r--r-- | test cases/failing/68 subproj different versions/meson.build | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index 169bf4c..293b629 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -20,7 +20,7 @@ test run before they are even considered for submission. ## Tests -All new features must come with automatic tests that throughly prove +All new features must come with automatic tests that thoroughly prove that the feature is working as expected. Similarly bug fixes must come with a unit test that demonstrates the bug, proves that it has been fixed and prevents the feature from breaking in the future. diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 71494c8..560e389 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -271,8 +271,8 @@ class ConfigToolDependency(ExternalDependency): out = self._sanitize_version(out.strip()) # Some tools, like pcap-config don't supply a version, but also - # dont fail with --version, in that case just assume that there is - # only one verison and return it. + # don't fail with --version, in that case just assume that there is + # only one version and return it. if not out: return (tool, 'none') if versions: diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index e5aa43e..53bba60 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -968,7 +968,7 @@ class CrossBuildInfo: def get_properties(self): return self.config['properties'] - # Wehn compiling a cross compiler we use the native compiler for everything. + # When compiling a cross compiler we use the native compiler for everything. # But not when cross compiling a cross compiler. def need_cross_compiler(self): return 'host_machine' in self.config diff --git a/test cases/failing/68 subproj different versions/meson.build b/test cases/failing/68 subproj different versions/meson.build index 7690277..e964e42 100644 --- a/test cases/failing/68 subproj different versions/meson.build +++ b/test cases/failing/68 subproj different versions/meson.build @@ -3,7 +3,7 @@ project('super', 'c') # A will use version 1 of C a_dep = dependency('a', fallback: ['a', 'a_dep']) -# B will fail becuase it requests version 2 of C +# B will fail because it requests version 2 of C b_dep = dependency('b', fallback: ['b', 'b_dep']) main = executable('main', files('main.c'), dependencies: [a_dep, b_dep]) |