aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiPhish <hiphish@posteo.de>2023-04-09 20:00:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2023-04-11 17:10:01 +0300
commit439a61affab391d44341ac3113592698abd4143b (patch)
tree6fd31f98446f2aaf7d4f7062f102abbf23f021fb
parenta912193fd8ed5e673009e879c088aa70b297811a (diff)
downloadmeson-439a61affab391d44341ac3113592698abd4143b.zip
meson-439a61affab391d44341ac3113592698abd4143b.tar.gz
meson-439a61affab391d44341ac3113592698abd4143b.tar.bz2
Change "can not" to "cannot" throughout project
The word "cannot" expresses inability to do something whereas "can not" expresses the ability to refrain from doing something.
-rw-r--r--docs/markdown/Build-options.md2
-rw-r--r--docs/markdown/Build-targets.md2
-rw-r--r--docs/markdown/Compiler-properties.md2
-rw-r--r--docs/markdown/Design-rationale.md2
-rw-r--r--docs/markdown/External-commands.md2
-rw-r--r--docs/markdown/FAQ.md6
-rw-r--r--docs/markdown/Feature-autodetection.md2
-rw-r--r--docs/markdown/Generating-sources.md2
-rw-r--r--docs/markdown/Mixing-build-systems.md2
-rw-r--r--docs/markdown/Release-notes-for-0.47.0.md2
-rw-r--r--docs/markdown/Release-notes-for-0.49.0.md2
-rw-r--r--docs/markdown/Release-notes-for-0.51.0.md2
-rw-r--r--docs/markdown/Unit-tests.md4
-rw-r--r--docs/yaml/builtins/meson.yaml2
-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
-rwxr-xr-xpackaging/createmsi.py2
-rwxr-xr-xpackaging/createpkg.py2
-rw-r--r--test cases/common/102 extract same name/meson.build2
-rw-r--r--test cases/common/151 duplicate source names/meson.build2
-rw-r--r--test cases/common/216 custom target input extracted objects/meson.build2
-rw-r--r--test cases/common/239 includedir violation/subprojects/sub/include/placeholder.h2
-rw-r--r--test cases/common/51 run target/helloprinter.c2
-rw-r--r--test cases/d/3 shared library/meson.build2
-rw-r--r--test cases/d/4 library versions/meson.build2
-rw-r--r--test cases/d/7 multilib/meson.build2
-rw-r--r--test cases/failing/127 extract from unity/test.json2
-rw-r--r--unittests/machinefiletests.py2
41 files changed, 45 insertions, 45 deletions
diff --git a/docs/markdown/Build-options.md b/docs/markdown/Build-options.md
index af4a58a..93e3326 100644
--- a/docs/markdown/Build-options.md
+++ b/docs/markdown/Build-options.md
@@ -183,7 +183,7 @@ issue the following command:
prefix = get_option('prefix')
```
-It should be noted that you can not set option values in your Meson
+It should be noted that you cannot set option values in your Meson
scripts. They have to be set externally with the `meson configure`
command line tool. Running `meson configure` without arguments in a
build dir shows you all options you can set.
diff --git a/docs/markdown/Build-targets.md b/docs/markdown/Build-targets.md
index 83f959f..780595c 100644
--- a/docs/markdown/Build-targets.md
+++ b/docs/markdown/Build-targets.md
@@ -9,7 +9,7 @@ Meson provides four kinds of build targets: executables, libraries
the build configuration time), static libraries, and shared libraries.
They are created with the commands `executable`, `library`,
`static_library` and `shared_library`, respectively. All objects created
-in this way are **immutable**. That is, you can not change any aspect of
+in this way are **immutable**. That is, you cannot change any aspect of
them after they have been constructed. This ensures that all information
pertaining to a given build target is specified in one well defined
place.
diff --git a/docs/markdown/Compiler-properties.md b/docs/markdown/Compiler-properties.md
index de28d9b..6d04c8b 100644
--- a/docs/markdown/Compiler-properties.md
+++ b/docs/markdown/Compiler-properties.md
@@ -228,4 +228,4 @@ has_special_flags = [[#compiler.has_argument]]('-Wspecialthing')
```
*Note*: some compilers silently swallow command line arguments they do
-not understand. Thus this test can not be made 100% reliable.
+not understand. Thus this test cannot be made 100% reliable.
diff --git a/docs/markdown/Design-rationale.md b/docs/markdown/Design-rationale.md
index a3bd5bb..67fec0a 100644
--- a/docs/markdown/Design-rationale.md
+++ b/docs/markdown/Design-rationale.md
@@ -240,7 +240,7 @@ project('pch demo', 'cxx')
executable('myapp', 'myapp.cpp', pch : 'pch/myapp.hh')
```
-The main reason other build systems can not provide pch support this
+The main reason other build systems cannot provide pch support this
easily is because they don't enforce certain best practices. Due to
the way include paths work, it is impossible to provide pch support
that always works with both in-source and out-of-source
diff --git a/docs/markdown/External-commands.md b/docs/markdown/External-commands.md
index 026ed54..07445ac 100644
--- a/docs/markdown/External-commands.md
+++ b/docs/markdown/External-commands.md
@@ -42,7 +42,7 @@ Meson will autodetect scripts with a shebang line and run them with
the executable/interpreter specified in it both on Windows and on
Unixes.
-Note that you can not pass your command line as a single string. That
+Note that you cannot pass your command line as a single string. That
is, calling `run_command('do_something foo bar')` will not work. You
must either split up the string into separate arguments or pass the
split command as an array. It should also be noted that Meson will not
diff --git a/docs/markdown/FAQ.md b/docs/markdown/FAQ.md
index d3e3d0a..8bcea20 100644
--- a/docs/markdown/FAQ.md
+++ b/docs/markdown/FAQ.md
@@ -62,7 +62,7 @@ executable('myprog', sources : '*.cpp') # This does NOT work!
```
Meson does not support this syntax and the reason for this is simple.
-This can not be made both reliable and fast. By reliable we mean that
+This cannot be made both reliable and fast. By reliable we mean that
if the user adds a new source file to the subdirectory, Meson should
detect that and make it part of the build automatically.
@@ -149,7 +149,7 @@ subdir('tests') # test binaries would link against the library here
## Why is there not a Make backend?
Because Make is slow. This is not an implementation issue, Make simply
-can not be made fast. For further info we recommend you read [this
+cannot be made fast. For further info we recommend you read [this
post](http://neugierig.org/software/chromium/notes/2011/02/ninja.html)
by Evan Martin, the author of Ninja. Makefiles also have a syntax that
is very unpleasant to write which makes them a big maintenance burden.
@@ -348,7 +348,7 @@ projects attempting to do just this:
Meson needs to know several details about each compiler in order to
compile code with it. These include things such as which compiler
flags to use for each option and how to detect the compiler from its
-output. This information can not be input via a configuration file,
+output. This information cannot be input via a configuration file,
instead it requires changes to Meson's source code that need to be
submitted to Meson master repository. In theory you can run your own
forked version with custom patches, but that's not good use of your
diff --git a/docs/markdown/Feature-autodetection.md b/docs/markdown/Feature-autodetection.md
index 2371226..bd6be75 100644
--- a/docs/markdown/Feature-autodetection.md
+++ b/docs/markdown/Feature-autodetection.md
@@ -17,7 +17,7 @@ automatically.
If you do not wish to use Ccache for some reason, just specify your
compiler with environment variables `CC` and/or `CXX` when first
-running Meson (remember that once specified the compiler can not be
+running Meson (remember that once specified the compiler cannot be
changed). Meson will then use the specified compiler without Ccache.
Coverage
diff --git a/docs/markdown/Generating-sources.md b/docs/markdown/Generating-sources.md
index 91e0930..8b1b44e 100644
--- a/docs/markdown/Generating-sources.md
+++ b/docs/markdown/Generating-sources.md
@@ -179,7 +179,7 @@ gen2 = generator(someprog,
arguments : ['--out_dir=@BUILD_DIR@', '@INPUT@'])
```
-In this case you can not use the plain `@OUTPUT@` variable, as it
+In this case you cannot use the plain `@OUTPUT@` variable, as it
would be ambiguous. This program only needs to know the output
directory, it will generate the file names by itself.
diff --git a/docs/markdown/Mixing-build-systems.md b/docs/markdown/Mixing-build-systems.md
index 6830064..73f91b7 100644
--- a/docs/markdown/Mixing-build-systems.md
+++ b/docs/markdown/Mixing-build-systems.md
@@ -12,7 +12,7 @@ is the common case.
This page lists the Meson project's stance on mixing build systems.
The tl/dr version is that while we do provide some functionality for
this use case, it only works for simple cases. Anything more complex
-can not be made reliable and trying to do that would burden Meson
+cannot be made reliable and trying to do that would burden Meson
developers with an effectively infinite maintenance burden. Thus these
use cases are not guaranteed to work, and even if a project using them
works today there are no guarantees that it will work in any future
diff --git a/docs/markdown/Release-notes-for-0.47.0.md b/docs/markdown/Release-notes-for-0.47.0.md
index f85a41b..c0e0fd7 100644
--- a/docs/markdown/Release-notes-for-0.47.0.md
+++ b/docs/markdown/Release-notes-for-0.47.0.md
@@ -24,7 +24,7 @@ preprocessor symbol's value `"ab" "cd"` is returned as `"abcd"`.
Cross-compilation is now supported for ARM targets using ARM compiler
version 6 - ARMCLANG. The required ARMCLANG compiler options for
building a shareable library are not included in the current Meson
-implementation for ARMCLANG support, so it can not build shareable
+implementation for ARMCLANG support, so it cannot build shareable
libraries. This current Meson implementation for ARMCLANG support can
not build assembly files with arm syntax (we need to use armasm
instead of ARMCLANG for the `.s` files with this syntax) and only
diff --git a/docs/markdown/Release-notes-for-0.49.0.md b/docs/markdown/Release-notes-for-0.49.0.md
index 6b84af1..4c09183 100644
--- a/docs/markdown/Release-notes-for-0.49.0.md
+++ b/docs/markdown/Release-notes-for-0.49.0.md
@@ -279,7 +279,7 @@ associated with the generated pkg-config file should be passed as
first positional argument instead of in the `libraries` keyword
argument. The previous behaviour is maintained but prints a
deprecation warning and support for this will be removed in a future
-Meson release. If you can not create the needed pkg-config file
+Meson release. If you cannot create the needed pkg-config file
without this warning, please file an issue with as much details as
possible about the situation.
diff --git a/docs/markdown/Release-notes-for-0.51.0.md b/docs/markdown/Release-notes-for-0.51.0.md
index e015a95..da80db2 100644
--- a/docs/markdown/Release-notes-for-0.51.0.md
+++ b/docs/markdown/Release-notes-for-0.51.0.md
@@ -213,7 +213,7 @@ The output of `custom_target` and `custom_target[i]` can be used in
integrating custom code generator steps, but note that there are many
limitations:
- - Meson can not know about link dependencies of the custom target. If
+ - Meson cannot know about link dependencies of the custom target. If
the target requires further link libraries, you need to add them manually
- The user is responsible for ensuring that the code produced by
diff --git a/docs/markdown/Unit-tests.md b/docs/markdown/Unit-tests.md
index 664f99e..36fbdcf 100644
--- a/docs/markdown/Unit-tests.md
+++ b/docs/markdown/Unit-tests.md
@@ -61,7 +61,7 @@ your build directory.
## Parallelism
To reduce test times, Meson will by default run multiple unit tests in
-parallel. It is common to have some tests which can not be run in
+parallel. It is common to have some tests which cannot be run in
parallel because they require unique hold on some resource such as a
file or a D-Bus name. You have to specify these tests with a keyword
argument.
@@ -106,7 +106,7 @@ completed.
## Skipped tests and hard errors
-Sometimes a test can only determine at runtime that it can not be run.
+Sometimes a test can only determine at runtime that it cannot be run.
For the default `exitcode` testing protocol, the GNU standard approach
in this case is to exit the program with error code 77. Meson will
diff --git a/docs/yaml/builtins/meson.yaml b/docs/yaml/builtins/meson.yaml
index 966159c..20c8c80 100644
--- a/docs/yaml/builtins/meson.yaml
+++ b/docs/yaml/builtins/meson.yaml
@@ -14,7 +14,7 @@ methods:
distribution source has been generated but before it is
archived. Note that this runs the script file that is in the
_staging_ directory, not the one in the source directory. If the
- script file can not be found in the staging directory, it is a hard
+ script file cannot be found in the staging directory, it is a hard
error. The `MESON_DIST_ROOT` environment variables is set when dist scripts is
run.
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:
diff --git a/packaging/createmsi.py b/packaging/createmsi.py
index fe49b7b..4febc39 100755
--- a/packaging/createmsi.py
+++ b/packaging/createmsi.py
@@ -246,7 +246,7 @@ class PackageGenerator:
})
ET.SubElement(vcredist_feature, 'MergeRef', {'Id': 'VCRedist'})
ET.ElementTree(self.root).write(self.main_xml, encoding='utf-8', xml_declaration=True)
- # ElementTree can not do prettyprinting so do it manually
+ # ElementTree cannot do pretty-printing, so do it manually
import xml.dom.minidom
doc = xml.dom.minidom.parse(self.main_xml)
with open(self.main_xml, 'w') as open_file:
diff --git a/packaging/createpkg.py b/packaging/createpkg.py
index 70da656..7f3a69e 100755
--- a/packaging/createpkg.py
+++ b/packaging/createpkg.py
@@ -96,7 +96,7 @@ class PkgGenerator:
'version': '0', # self.version,
'onConclusion': 'none'}).text = self.pkgname
ET.ElementTree(root).write(self.distribution_file, encoding='utf-8', xml_declaration=True)
- # ElementTree can not do prettyprinting so do it manually
+ # ElementTree cannot do pretty-printing, so do it manually
import xml.dom.minidom
doc = xml.dom.minidom.parse(self.distribution_file)
with open(self.distribution_file, 'w') as open_file:
diff --git a/test cases/common/102 extract same name/meson.build b/test cases/common/102 extract same name/meson.build
index 08daa5b..86e68b9 100644
--- a/test cases/common/102 extract same name/meson.build
+++ b/test cases/common/102 extract same name/meson.build
@@ -9,7 +9,7 @@ if meson.backend() == 'xcode'
#
# No-one has reverse engineered the naming scheme so we would access them.
# IF you feel up to the challenge, patches welcome.
- error('MESON_SKIP_TEST, Xcode can not extract objs when they would have the same filename.')
+ error('MESON_SKIP_TEST, Xcode cannot extract objs when they would have the same filename.')
endif
lib = library('somelib', ['lib.c', 'src/lib.c'])
diff --git a/test cases/common/151 duplicate source names/meson.build b/test cases/common/151 duplicate source names/meson.build
index 635aa8c..74fc0ff 100644
--- a/test cases/common/151 duplicate source names/meson.build
+++ b/test cases/common/151 duplicate source names/meson.build
@@ -9,7 +9,7 @@ if meson.backend() == 'xcode'
#
# No-one has reverse engineered the naming scheme so we would access them.
# IF you feel up to the challenge, patches welcome.
- error('MESON_SKIP_TEST, Xcode can not extract objs when they would have the same filename.')
+ error('MESON_SKIP_TEST, Xcode cannot extract objs when they would have the same filename.')
endif
sources = []
diff --git a/test cases/common/216 custom target input extracted objects/meson.build b/test cases/common/216 custom target input extracted objects/meson.build
index 654b76d..136e154 100644
--- a/test cases/common/216 custom target input extracted objects/meson.build
+++ b/test cases/common/216 custom target input extracted objects/meson.build
@@ -1,7 +1,7 @@
project('custom target input extracted objects', 'c')
if meson.backend() == 'xcode'
- error('MESON_SKIP_TEST: sometimes Xcode puts object files in weird paths and we can not extract them.')
+ error('MESON_SKIP_TEST: sometimes Xcode puts object files in weird paths and we cannot extract them.')
endif
diff --git a/test cases/common/239 includedir violation/subprojects/sub/include/placeholder.h b/test cases/common/239 includedir violation/subprojects/sub/include/placeholder.h
index 196f917..22653bf 100644
--- a/test cases/common/239 includedir violation/subprojects/sub/include/placeholder.h
+++ b/test cases/common/239 includedir violation/subprojects/sub/include/placeholder.h
@@ -1,3 +1,3 @@
#pragma once
-// Git can not handle empty directories, so there must be something here.
+// Git cannot handle empty directories, so there must be something here.
diff --git a/test cases/common/51 run target/helloprinter.c b/test cases/common/51 run target/helloprinter.c
index 4a6e0ac..dbbe82f 100644
--- a/test cases/common/51 run target/helloprinter.c
+++ b/test cases/common/51 run target/helloprinter.c
@@ -2,7 +2,7 @@
int main(int argc, char **argv) {
if(argc != 2) {
- printf("I can not haz argument.\n");
+ printf("I cannot haz argument.\n");
return 1;
} else {
printf("I can haz argument: %s\n", argv[1]);
diff --git a/test cases/d/3 shared library/meson.build b/test cases/d/3 shared library/meson.build
index fa41779..fc7a0c4 100644
--- a/test cases/d/3 shared library/meson.build
+++ b/test cases/d/3 shared library/meson.build
@@ -3,7 +3,7 @@ project('D Shared Library', 'd')
dc = meson.get_compiler('d')
if dc.get_id() == 'gcc'
if dc.version().version_compare('< 8')
- error('MESON_SKIP_TEST: GDC < 8.0 can not build shared libraries')
+ error('MESON_SKIP_TEST: GDC < 8.0 cannot build shared libraries')
endif
endif
diff --git a/test cases/d/4 library versions/meson.build b/test cases/d/4 library versions/meson.build
index c745b92..1baebab 100644
--- a/test cases/d/4 library versions/meson.build
+++ b/test cases/d/4 library versions/meson.build
@@ -3,7 +3,7 @@ project('D library versions', 'd')
dc = meson.get_compiler('d')
if dc.get_id() == 'gcc'
if dc.version().version_compare('< 8')
- error('MESON_SKIP_TEST: GDC < 8.0 can not build shared libraries')
+ error('MESON_SKIP_TEST: GDC < 8.0 cannot build shared libraries')
endif
endif
diff --git a/test cases/d/7 multilib/meson.build b/test cases/d/7 multilib/meson.build
index 1879c08..0afd266 100644
--- a/test cases/d/7 multilib/meson.build
+++ b/test cases/d/7 multilib/meson.build
@@ -3,7 +3,7 @@ project('D Multiple Versioned Shared Libraries', 'd')
dc = meson.get_compiler('d')
if dc.get_id() == 'gcc'
if dc.version().version_compare('< 8')
- error('MESON_SKIP_TEST: GDC < 8.0 can not build shared libraries')
+ error('MESON_SKIP_TEST: GDC < 8.0 cannot build shared libraries')
endif
endif
diff --git a/test cases/failing/127 extract from unity/test.json b/test cases/failing/127 extract from unity/test.json
index b163ae6..9403481 100644
--- a/test cases/failing/127 extract from unity/test.json
+++ b/test cases/failing/127 extract from unity/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/127 extract from unity/meson.build:4:37: ERROR: Single object files can not be extracted in Unity builds. You can only extract all the object files for each compiler at once."
+ "line": "test cases/failing/127 extract from unity/meson.build:4:37: ERROR: 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/unittests/machinefiletests.py b/unittests/machinefiletests.py
index d2c3c0a..235d7dc 100644
--- a/unittests/machinefiletests.py
+++ b/unittests/machinefiletests.py
@@ -719,7 +719,7 @@ class CrossFileTests(BasePlatformTests):
# The test uses mocking and thus requires that the current process is the
# one to run the Meson steps. If we are using an external test executable
# (most commonly in Debian autopkgtests) then the mocking won't work.
- @skipIf('MESON_EXE' in os.environ, 'MESON_EXE is defined, can not use mocking.')
+ @skipIf('MESON_EXE' in os.environ, 'MESON_EXE is defined, cannot use mocking.')
def test_cross_file_system_paths(self):
if is_windows():
raise SkipTest('system crossfile paths not defined for Windows (yet)')