aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/backend/vs2010backend.py2
-rw-r--r--mesonbuild/backend/xcodebackend.py2
-rw-r--r--mesonbuild/build.py2
-rw-r--r--mesonbuild/compilers/cs.py2
-rw-r--r--mesonbuild/compilers/cuda.py2
-rw-r--r--mesonbuild/compilers/d.py2
-rw-r--r--mesonbuild/compilers/java.py2
-rw-r--r--mesonbuild/compilers/mixins/clike.py2
-rw-r--r--mesonbuild/compilers/mixins/visualstudio.py2
-rw-r--r--mesonbuild/compilers/rust.py2
-rw-r--r--mesonbuild/compilers/swift.py2
-rw-r--r--mesonbuild/compilers/vala.py2
-rw-r--r--mesonbuild/modules/gnome.py2
-rw-r--r--mesonbuild/mtest.py2
15 files changed, 16 insertions, 16 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index e802217..d8b05b1 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2602,7 +2602,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
# inside it. This can be either the final PDB (for, say,
# foo.exe) or an object pdb (for foo.obj). If the former, then
# each compilation step locks the pdb file for writing, which
- # is a bottleneck and object files from one target can not be
+ # is a bottleneck and object files from one target cannot be
# used in a different target. The latter seems to be the
# sensible one (and what Unix does) but there is a catch. If
# you try to use precompiled headers MSVC will error out
@@ -3123,7 +3123,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
def guess_external_link_dependencies(self, linker, target, commands, internal):
# Ideally the linker would generate dependency information that could be used.
# But that has 2 problems:
- # * currently ld can not create dependency information in a way that ninja can use:
+ # * currently ld cannot create dependency information in a way that ninja can use:
# https://sourceware.org/bugzilla/show_bug.cgi?id=22843
# * Meson optimizes libraries from the same build using the symbol extractor.
# Just letting ninja use ld generated dependencies would undo this optimization.
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 47e19a4..37d0365 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -866,7 +866,7 @@ class Vs2010Backend(backends.Backend):
ofname_tmp = ofname + '~'
tree.write(ofname_tmp, encoding='utf-8', xml_declaration=True)
- # ElementTree can not do prettyprinting so do it manually
+ # ElementTree cannot do pretty-printing, so do it manually
doc = xml.dom.minidom.parse(ofname_tmp)
with open(ofname_tmp, 'w', encoding='utf-8') as of:
of.write(doc.toprettyxml())
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index b5cf83a..523f842 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -1535,7 +1535,7 @@ class XCodeBackend(backends.Backend):
# add the root build dir to the search path. So add an absolute path instead.
# This may break reproducible builds, in which case patches are welcome.
lang_cargs += self.get_custom_target_dir_include_args(target, compiler, absolute_path=True)
- # Xcode can not handle separate compilation flags for C and ObjectiveC. They are both
+ # Xcode cannot handle separate compilation flags for C and ObjectiveC. They are both
# put in OTHER_CFLAGS. Same with C++ and ObjectiveC++.
if lang == 'objc':
lang = 'c'
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 0cab04e..5408b21 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -452,7 +452,7 @@ class ExtractedObjects(HoldableObject):
for comp, srcs in extracted_cmpsrcs.items():
if set(srcs) != set(cmpsrcs[comp]):
- raise MesonException('Single object files can not be extracted '
+ raise MesonException('Single object files cannot be extracted '
'in Unity builds. You can only extract all '
'the object files for each compiler at once.')
diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py
index 14fcfd7..f0bed5f 100644
--- a/mesonbuild/compilers/cs.py
+++ b/mesonbuild/compilers/cs.py
@@ -100,7 +100,7 @@ class CsCompiler(BasicLinkerIsCompilerMixin, Compiler):
pc = subprocess.Popen(self.exelist + self.get_always_args() + [src], cwd=work_dir)
pc.wait()
if pc.returncode != 0:
- raise EnvironmentException('C# compiler %s can not compile programs.' % self.name_string())
+ raise EnvironmentException('C# compiler %s cannot compile programs.' % self.name_string())
if self.runner:
cmdlist = [self.runner, obj]
else:
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index 9bf263c..70a4fe9 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -557,7 +557,7 @@ class CudaCompiler(Compiler):
mlog.debug(stde)
mlog.debug('-----')
if pc.returncode != 0:
- raise EnvironmentException(f'Compiler {self.name_string()} can not compile programs.')
+ raise EnvironmentException(f'Compiler {self.name_string()} cannot compile programs.')
# Run sanity check (if possible)
if self.is_cross:
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index 15b22d6..5d43a60 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -559,7 +559,7 @@ class DCompiler(Compiler):
pc = subprocess.Popen(self.exelist + self.get_output_args(output_name) + self._get_target_arch_args() + [source_name], cwd=work_dir)
pc.wait()
if pc.returncode != 0:
- raise EnvironmentException('D compiler %s can not compile programs.' % self.name_string())
+ raise EnvironmentException('D compiler %s cannot compile programs.' % self.name_string())
if self.is_cross:
if self.exe_wrapper is None:
# Can't check if the binaries run so we have to assume they do
diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py
index ebae509..42cf0a1 100644
--- a/mesonbuild/compilers/java.py
+++ b/mesonbuild/compilers/java.py
@@ -97,7 +97,7 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler):
pc = subprocess.Popen(self.exelist + [src], cwd=work_dir)
pc.wait()
if pc.returncode != 0:
- raise EnvironmentException(f'Java compiler {self.name_string()} can not compile programs.')
+ raise EnvironmentException(f'Java compiler {self.name_string()} cannot compile programs.')
runner = shutil.which(self.javarunner)
if runner:
cmdlist = [runner, obj]
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index e3579a9..8c17b5b 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -327,7 +327,7 @@ class CLikeCompiler(Compiler):
mlog.debug(stde)
mlog.debug('-----')
if pc.returncode != 0:
- raise mesonlib.EnvironmentException(f'Compiler {self.name_string()} can not compile programs.')
+ raise mesonlib.EnvironmentException(f'Compiler {self.name_string()} cannot compile programs.')
# Run sanity check
if self.is_cross:
if self.exe_wrapper is None:
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
index 119a2bf..12522e1 100644
--- a/mesonbuild/compilers/mixins/visualstudio.py
+++ b/mesonbuild/compilers/mixins/visualstudio.py
@@ -450,7 +450,7 @@ class MSVCCompiler(VisualStudioLikeCompiler):
if self.version.split('.')[0] == '16' and instruction_set == 'avx':
# VS documentation says that this exists and should work, but
# it does not. The headers do not contain AVX intrinsics
- # and they can not be called.
+ # and they cannot be called.
return None
return super().get_instruction_set_args(instruction_set)
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
index 9e5ebc8..2d158e3 100644
--- a/mesonbuild/compilers/rust.py
+++ b/mesonbuild/compilers/rust.py
@@ -87,7 +87,7 @@ class RustCompiler(Compiler):
stdo = _stdo.decode('utf-8', errors='replace')
stde = _stde.decode('utf-8', errors='replace')
if pc.returncode != 0:
- raise EnvironmentException('Rust compiler {} can not compile programs.\n{}\n{}'.format(
+ raise EnvironmentException('Rust compiler {} cannot compile programs.\n{}\n{}'.format(
self.name_string(),
stdo,
stde))
diff --git a/mesonbuild/compilers/swift.py b/mesonbuild/compilers/swift.py
index ec4c7a3..ebf29f8 100644
--- a/mesonbuild/compilers/swift.py
+++ b/mesonbuild/compilers/swift.py
@@ -116,7 +116,7 @@ class SwiftCompiler(Compiler):
pc = subprocess.Popen(self.exelist + extra_flags + ['-emit-executable', '-o', output_name, src], cwd=work_dir)
pc.wait()
if pc.returncode != 0:
- raise EnvironmentException('Swift compiler %s can not compile programs.' % self.name_string())
+ raise EnvironmentException('Swift compiler %s cannot compile programs.' % self.name_string())
if self.is_cross:
# Can't check if the binaries run so we have to assume they do
return
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
index 23b01a3..40cfc14 100644
--- a/mesonbuild/compilers/vala.py
+++ b/mesonbuild/compilers/vala.py
@@ -102,7 +102,7 @@ class ValaCompiler(Compiler):
extra_flags += environment.coredata.get_external_link_args(self.for_machine, self.language)
with self.cached_compile(code, environment.coredata, extra_args=extra_flags, mode='compile') as p:
if p.returncode != 0:
- msg = f'Vala compiler {self.name_string()!r} can not compile programs'
+ msg = f'Vala compiler {self.name_string()!r} cannot compile programs'
raise EnvironmentException(msg)
def get_buildtype_args(self, buildtype: str) -> T.List[str]:
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index a0e5330..019b1ea 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -420,7 +420,7 @@ class GnomeModule(ExtensionModule):
depends.append(dep)
subdirs.append(dep.get_subdir())
if not mesonlib.version_compare(glib_version, gresource_dep_needed_version):
- m = 'The "dependencies" argument of gnome.compile_resources() can not\n' \
+ m = 'The "dependencies" argument of gnome.compile_resources() cannot\n' \
'be used with the current version of glib-compile-resources due to\n' \
'<https://bugzilla.gnome.org/show_bug.cgi?id=774368>'
raise MesonException(m)
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index acf28a2..53550b5 100644
--- a/mesonbuild/mtest.py
+++ b/mesonbuild/mtest.py
@@ -1447,7 +1447,7 @@ class SingleTestRunner:
async def run(self, harness: 'TestHarness') -> TestRun:
if self.cmd is None:
- self.stdo = 'Not run because can not execute cross compiled binaries.'
+ self.stdo = 'Not run because cannot execute cross compiled binaries.'
harness.log_start_test(self.runobj)
self.runobj.complete_skip()
else:
generated by cgit v1.1 at 2024-08-31 12:06:34 +0000