Correct spelling mistakes.

pull/2916/head
Edward Betts 7 years ago committed by Jussi Pakkanen
parent a941ba219c
commit bdfcecd2c6
  1. 2
      docs/markdown/Contributing.md
  2. 4
      mesonbuild/dependencies/base.py
  3. 2
      mesonbuild/environment.py
  4. 2
      test cases/failing/68 subproj different versions/meson.build

@ -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.

@ -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:

@ -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

@ -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])

Loading…
Cancel
Save