aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
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 /mesonbuild
parentca924451ac257d4b410d5da33d9354d195490237 (diff)
downloadmeson-a576791064b92bfe44c958648eee64f55e87b23d.zip
meson-a576791064b92bfe44c958648eee64f55e87b23d.tar.gz
meson-a576791064b92bfe44c958648eee64f55e87b23d.tar.bz2
Use American English - 'ise' -> 'ize' where applicable
Diffstat (limited to 'mesonbuild')
-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
4 files changed, 7 insertions, 7 deletions
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()