diff options
author | Wolfgang Stöggl <c72578@yahoo.de> | 2019-11-06 14:49:00 +0100 |
---|---|---|
committer | Michael Hirsch, Ph.D <10931741+scivision@users.noreply.github.com> | 2019-11-06 09:55:30 -0500 |
commit | f037e7ef4538b37625c0893d32cad36e72648c8a (patch) | |
tree | 90c594eac530b600ac64168e50f2f8a298ebff56 /mesonbuild/cmake | |
parent | f56ef583d3c8ecda7725ca04b48011c9081a7349 (diff) | |
download | meson-f037e7ef4538b37625c0893d32cad36e72648c8a.zip meson-f037e7ef4538b37625c0893d32cad36e72648c8a.tar.gz meson-f037e7ef4538b37625c0893d32cad36e72648c8a.tar.bz2 |
Fix typos found by codespell
- Typos were found by codespell v1.16.0
Diffstat (limited to 'mesonbuild/cmake')
-rwxr-xr-x | mesonbuild/cmake/data/run_ctgt.py | 6 | ||||
-rw-r--r-- | mesonbuild/cmake/fileapi.py | 4 | ||||
-rw-r--r-- | mesonbuild/cmake/interpreter.py | 10 | ||||
-rw-r--r-- | mesonbuild/cmake/traceparser.py | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/mesonbuild/cmake/data/run_ctgt.py b/mesonbuild/cmake/data/run_ctgt.py index 0a9b80d..4e85b86 100755 --- a/mesonbuild/cmake/data/run_ctgt.py +++ b/mesonbuild/cmake/data/run_ctgt.py @@ -7,14 +7,14 @@ import os import sys commands = [[]] -SEPERATOR = ';;;' +SEPARATOR = ';;;' # Generate CMD parameters parser = argparse.ArgumentParser(description='Wrapper for add_custom_command') parser.add_argument('-d', '--directory', type=str, metavar='D', required=True, help='Working directory to cwd to') parser.add_argument('-o', '--outputs', nargs='+', metavar='O', required=True, help='Expected output files') parser.add_argument('-O', '--original-outputs', nargs='+', metavar='O', required=True, help='Output files expected by CMake') -parser.add_argument('commands', nargs=argparse.REMAINDER, help='A "{}" seperated list of commands'.format(SEPERATOR)) +parser.add_argument('commands', nargs=argparse.REMAINDER, help='A "{}" separated list of commands'.format(SEPARATOR)) # Parse args = parser.parse_args() @@ -24,7 +24,7 @@ if len(args.outputs) != len(args.original_outputs): sys.exit(1) for i in args.commands: - if i == SEPERATOR: + if i == SEPARATOR: commands += [[]] continue diff --git a/mesonbuild/cmake/fileapi.py b/mesonbuild/cmake/fileapi.py index df7c73a..5ee6ad0 100644 --- a/mesonbuild/cmake/fileapi.py +++ b/mesonbuild/cmake/fileapi.py @@ -155,7 +155,7 @@ class CMakeFileAPI: link_flags += [i['fragment']] # TODO The `dependencies` entry is new in the file API. - # maybe we can make use of that in addtion to the + # maybe we can make use of that in addition to the # implicit dependency detection tgt_data = { 'artifacts': [x.get('path', '') for x in tgt.get('artifacts', [])], @@ -175,7 +175,7 @@ class CMakeFileAPI: processed_src_idx = [] for cg in tgt.get('compileGroups', []): # Again, why an array, when there is usually only one element - # and arguments are seperated with spaces... + # and arguments are separated with spaces... flags = [] for i in cg.get('compileCommandFragments', []): flags += [i['fragment']] diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 1c672be..3e20dd6 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -404,7 +404,7 @@ class ConverterCustomTarget: # Modify the original outputs if they are relative. Again, # relative paths are relative to ${CMAKE_CURRENT_BINARY_DIR} - # and the first disclaimer is stil in effect + # and the first disclaimer is still in effect def ensure_absolute(x: str): if os.path.isabs(x): return x @@ -562,9 +562,9 @@ class CMakeInterpreter: raise CMakeException('Failed to configure the CMake subproject') def initialise(self, extra_cmake_options: List[str]) -> None: - # Run configure the old way becuse doing it + # Run configure the old way because doing it # with the server doesn't work for some reason - # Aditionally, the File API requires a configure anyway + # Additionally, the File API requires a configure anyway self.configure(extra_cmake_options) # Continue with the file API If supported @@ -869,7 +869,7 @@ class CMakeInterpreter: def process_custom_target(tgt: ConverterCustomTarget) -> None: # CMake allows to specify multiple commands in a custom target. # To map this to meson, a helper script is used to execute all - # commands in order. This addtionally allows setting the working + # commands in order. This additionally allows setting the working # directory. tgt_var = tgt.name # type: str @@ -893,7 +893,7 @@ class CMakeInterpreter: command += ['-O'] + tgt.original_outputs command += ['-d', tgt.working_dir] - # Generate the commands. Subcommands are seperated by ';;;' + # Generate the commands. Subcommands are separated by ';;;' for cmd in tgt.command: command += [resolve_source(x) for x in cmd] + [';;;'] diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py index 4d68924..7daef0b 100644 --- a/mesonbuild/cmake/traceparser.py +++ b/mesonbuild/cmake/traceparser.py @@ -499,11 +499,11 @@ class CMakeTraceParser: if curr_str is None: curr_str = i elif os.path.isfile(curr_str): - # Abort concatination if curr_str is an existing file + # Abort concatenation if curr_str is an existing file fixed_list += [curr_str] curr_str = i elif not reg_start.match(curr_str): - # Abort concatination if curr_str no longer matches the regex + # Abort concatenation if curr_str no longer matches the regex fixed_list += [curr_str] curr_str = i elif reg_end.match(i) or os.path.exists('{} {}'.format(curr_str, i)): |