aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2017-05-04 18:02:05 +1000
committerJussi Pakkanen <jpakkane@gmail.com>2017-05-04 22:09:27 +0300
commita576791064b92bfe44c958648eee64f55e87b23d (patch)
treef27b22873ab25ee2faaed50695a94ef8e7362253
parentca924451ac257d4b410d5da33d9354d195490237 (diff)
downloadmeson-a576791064b92bfe44c958648eee64f55e87b23d.zip
meson-a576791064b92bfe44c958648eee64f55e87b23d.tar.gz
meson-a576791064b92bfe44c958648eee64f55e87b23d.tar.bz2
Use American English - 'ise' -> 'ize' where applicable
-rw-r--r--contributing.txt2
-rw-r--r--docs/markdown/Adding-new-projects-to-wrapdb.md2
-rw-r--r--docs/markdown/Build-system-converters.md2
-rw-r--r--docs/markdown/Pkg-config-files.md2
-rw-r--r--docs/markdown/Tutorial.md2
-rw-r--r--docs/markdown/Using-multiple-build-directories.md2
-rw-r--r--docs/markdown/howtox.md2
-rw-r--r--mesonbuild/backend/backends.py4
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/backend/vs2010backend.py4
-rw-r--r--mesonbuild/backend/xcodebackend.py2
11 files changed, 14 insertions, 14 deletions
diff --git a/contributing.txt b/contributing.txt
index cb71ca0..fc6e0ba 100644
--- a/contributing.txt
+++ b/contributing.txt
@@ -46,7 +46,7 @@ What not to contribute?
There are a few things that people seem to want to add to Meson but which
are not there by design and will not be added either.
-The first one is defining your own functions or a generalised for loop.
+The first one is defining your own functions or a generalized for loop.
These are bad because they would make Meson's DSL Turing complete. The
second feature is a Make backend.
diff --git a/docs/markdown/Adding-new-projects-to-wrapdb.md b/docs/markdown/Adding-new-projects-to-wrapdb.md
index ea8d33c..e14e0ac 100644
--- a/docs/markdown/Adding-new-projects-to-wrapdb.md
+++ b/docs/markdown/Adding-new-projects-to-wrapdb.md
@@ -16,7 +16,7 @@ Wrapped subprojects are used much like external dependencies. Thus they should h
## Adding new project to the Wrap provider service
-Each project gets its own repo. It is initialised like this:
+Each project gets its own repo. It is initialized like this:
git init
git add readme.txt
diff --git a/docs/markdown/Build-system-converters.md b/docs/markdown/Build-system-converters.md
index 6c81658..18e7470 100644
--- a/docs/markdown/Build-system-converters.md
+++ b/docs/markdown/Build-system-converters.md
@@ -10,4 +10,4 @@ The scripts do not try to do a perfect conversion. This would be extremely diffi
cmake2meson.py path/to/CMake/project/root
-This command generates a skeleton Meson project definition that tries to mirror CMake's setup as close as possible. Once this is done, you need to go through these files manually and finalise the conversion. To make this task as simple as possible, the converter script will transfer all comments from the CMake definition into Meson definition.
+This command generates a skeleton Meson project definition that tries to mirror CMake's setup as close as possible. Once this is done, you need to go through these files manually and finalize the conversion. To make this task as simple as possible, the converter script will transfer all comments from the CMake definition into Meson definition.
diff --git a/docs/markdown/Pkg-config-files.md b/docs/markdown/Pkg-config-files.md
index bac90bc..dde4ac9 100644
--- a/docs/markdown/Pkg-config-files.md
+++ b/docs/markdown/Pkg-config-files.md
@@ -1,6 +1,6 @@
# Pkg config files
-[Pkg-config](https://en.wikipedia.org/wiki/Pkg-config) is a way for shared libraries to declare the compiler flags needed to use them. There are two different ways of generating Pkg-config files in Meson. The first way is to build them manually with the `configure_files` command. The second way is to use Meson's built in Pkg-config file generator. The difference between the two is that the latter is very simple and meant for basic use cases. The former should be used when you need to provide a more customised solution.
+[Pkg-config](https://en.wikipedia.org/wiki/Pkg-config) is a way for shared libraries to declare the compiler flags needed to use them. There are two different ways of generating Pkg-config files in Meson. The first way is to build them manually with the `configure_files` command. The second way is to use Meson's built in Pkg-config file generator. The difference between the two is that the latter is very simple and meant for basic use cases. The former should be used when you need to provide a more customized solution.
In this document we describe the simple generator approach. It is used in the following way.
diff --git a/docs/markdown/Tutorial.md b/docs/markdown/Tutorial.md
index 1ee7845..b8e268e 100644
--- a/docs/markdown/Tutorial.md
+++ b/docs/markdown/Tutorial.md
@@ -27,7 +27,7 @@ project('tutorial', 'c')
executable('demo', 'main.c')
```
-That is all. We are now ready to build our application. First we need to initialise the build by going into the source directory and issuing the following commands.
+That is all. We are now ready to build our application. First we need to initialize the build by going into the source directory and issuing the following commands.
```console
$ meson builddir
diff --git a/docs/markdown/Using-multiple-build-directories.md b/docs/markdown/Using-multiple-build-directories.md
index 9e170b8..c07b39c 100644
--- a/docs/markdown/Using-multiple-build-directories.md
+++ b/docs/markdown/Using-multiple-build-directories.md
@@ -36,7 +36,7 @@ The cross compilation file sets up Wine so that not only can you compile your ap
To compile any of these build types, just cd into the corresponding build directory and run `ninja` or instruct your IDE to do the same. Note that once you have set up your build directory once, you can just run Ninja and Meson will ensure that the resulting build is fully up to date according to the source. Even if you have not touched one of the directories in weeks and have done major changes to your build configuration, Meson will detect this and bring the build directory up to date (or print an error if it can't do that). This allows you to do most of your work in the default directory and use the others every now and then without having to babysit your build directories.
-## Specialised uses ##
+## Specialized uses ##
Separate build directories allows easy integration for various different kinds of tools. As an example, Clang comes with a static analyzer. It is meant to be run from scratch on a given source tree. The steps to run it with Meson are very simple.
diff --git a/docs/markdown/howtox.md b/docs/markdown/howtox.md
index bc83332..f95dfb9 100644
--- a/docs/markdown/howtox.md
+++ b/docs/markdown/howtox.md
@@ -75,7 +75,7 @@ configure_file(...)
## Producing a coverage report
-First initialise the build directory with this command.
+First initialize the build directory with this command.
```console
$ meson <other flags> -Db_coverage=true
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 65e1162..5bb58f5 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -220,7 +220,7 @@ class Backend:
raise MesonException('Unknown data type in object list.')
return obj_list
- def serialise_executable(self, exe, cmd_args, workdir, env={},
+ def serialize_executable(self, exe, cmd_args, workdir, env={},
capture=None):
import hashlib
# Can't just use exe.name here; it will likely be run more than once
@@ -265,7 +265,7 @@ class Backend:
pickle.dump(es, f)
return exe_data
- def serialise_tests(self):
+ def serialize_tests(self):
test_data = os.path.join(self.environment.get_scratch_dir(), 'meson_test_setup.dat')
with open(test_data, 'wb') as datafile:
self.write_test_file(datafile)
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 88bd7ca..eaf4cac 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -486,7 +486,7 @@ int dummy;
# CustomTarget command needs extra paths first.
if target.capture or ((mesonlib.is_windows() or mesonlib.is_cygwin()) and
self.determine_windows_extra_paths(target.command[0])):
- exe_data = self.serialise_executable(target.command[0], cmd[1:],
+ exe_data = self.serialize_executable(target.command[0], cmd[1:],
# All targets are built from the build dir
self.environment.get_build_dir(),
capture=ofilenames[0] if target.capture else None)
@@ -784,7 +784,7 @@ int dummy;
d.install_subdirs.append([src_dir, inst_dir, dst_dir, sd.install_mode])
def generate_tests(self, outfile):
- self.serialise_tests()
+ self.serialize_tests()
test_exe = get_meson_script(self.environment, 'mesontest')
cmd = [sys.executable, test_exe, '--no-rebuild']
if not self.environment.coredata.get_builtin_option('stdsplit'):
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index ac4c93b..e910a03 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -443,7 +443,7 @@ class Vs2010Backend(backends.Backend):
# Always use a wrapper because MSBuild eats random characters when
# there are many arguments.
tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target))
- exe_data = self.serialise_executable(target.command[0], cmd[1:],
+ exe_data = self.serialize_executable(target.command[0], cmd[1:],
# All targets run from the target dir
tdir_abs,
capture=ofilenames[0] if target.capture else None)
@@ -1182,7 +1182,7 @@ endlocal & call :cmErrorLevel %%errorlevel%% & goto :cmDone
exit /b %%1
:cmDone
if %%errorlevel%% neq 0 goto :VCEnd'''
- self.serialise_tests()
+ self.serialize_tests()
ET.SubElement(postbuild, 'Command').text =\
cmd_templ % ('" "'.join(test_command))
ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.targets')
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 622c802..16c0daf 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -66,7 +66,7 @@ class XCodeBackend(backends.Backend):
def generate(self, interp):
self.interpreter = interp
- test_data = self.serialise_tests()[0]
+ test_data = self.serialize_tests()[0]
self.generate_filemap()
self.generate_buildmap()
self.generate_buildstylemap()