diff --git a/docs/markdown/Conference-presentations.md b/docs/markdown/Conference-presentations.md index 15e43961f..abfc52f1e 100644 --- a/docs/markdown/Conference-presentations.md +++ b/docs/markdown/Conference-presentations.md @@ -8,7 +8,7 @@ - GStreamer conference 2015, [Done in 6.0 seconds](https://gstconf.ubicast.tv/videos/done-in-60-seconds-a-new-build-system-for-gstreamer) (jpakkane) -- LCA 2016, [Builds, dependencies and deployment in the modern multiplatform world](https://www.youtube.com/watch?v=CTJtKtQ8R5k&feature=youtu.be) (jpakkane) +- LCA 2016, [Builds, dependencies and deployment in the modern multiplatform world](https://www.youtube.com/watch?v=CTJtKtQ8R5k) (jpakkane) - GUADEC 2016, [Making your GNOME app compile 2.4x faster](https://media.ccc.de/v/44-making_your_gnome_app_compile_24x_faster) (nirbheek) diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 2aa966586..3fac0ff5c 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -430,7 +430,7 @@ be passed to [shared and static libraries](#library). `project`'s `default_options` overriding the values of these options for this target only, since 0.40.0 - `d_import_dirs` list of directories to look in for string imports used - in the D programmling language + in the D programming language - `d_unittest`, when set to true, the D modules are compiled in debug mode - `d_module_versions` list of module versions set when compiling D sources diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 61f753586..d613f5019 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -444,9 +444,9 @@ class Backend: copt_proxy = OptionOverrideProxy(target.option_overrides, self.environment.coredata.compiler_options) # First, the trivial ones that are impossible to override. # - # Add -nostdinc/-nostdinc++ if needed; can't be overriden + # Add -nostdinc/-nostdinc++ if needed; can't be overridden commands += self.get_cross_stdlib_args(target, compiler) - # Add things like /NOLOGO or -pipe; usually can't be overriden + # Add things like /NOLOGO or -pipe; usually can't be overridden commands += compiler.get_always_args() # Only add warning-flags by default if the buildtype enables it, and if # we weren't explicitly asked to not emit warnings (for Vala, f.ex) @@ -568,7 +568,7 @@ class Backend: if isinstance(exe, build.BuildTarget): is_cross = is_cross and exe.is_cross if isinstance(exe, dependencies.ExternalProgram): - # E.g. an external verificator or simulator program run on a generated executable. + # E.g. an external verifier or simulator program run on a generated executable. # Can always be run. is_cross = False if is_cross: diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index cea1b0832..bcda603ed 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -220,7 +220,7 @@ int dummy; outfile.write('# Suffix\n\n') self.generate_utils(outfile) self.generate_ending(outfile) - # Only ovewrite the old build file after the new one has been + # Only overwrite the old build file after the new one has been # fully created. os.replace(tempfilename, outfilename) self.generate_compdb() @@ -2236,7 +2236,7 @@ rule FORTRAN_DEP_HACK # Fortran is a bit weird (again). When you link against a library, just compiling a source file # requires the mod files that are output when single files are built. To do this right we would need to # scan all inputs and write out explicit deps for each file. That is stoo slow and too much effort so - # instead just have an ordered dependendy on the library. This ensures all required mod files are created. + # instead just have an ordered dependency on the library. This ensures all required mod files are created. # The real deps are then detected via dep file generation from the compiler. This breaks on compilers that # produce incorrect dep files but such is life. def get_fortran_orderdeps(self, target, compiler): @@ -2387,9 +2387,9 @@ rule FORTRAN_DEP_HACK commands += compilers.get_base_link_args(self.environment.coredata.base_options, linker, isinstance(target, build.SharedModule)) - # Add -nostdlib if needed; can't be overriden + # Add -nostdlib if needed; can't be overridden commands += self.get_cross_stdlib_link_args(target, linker) - # Add things like /NOLOGO; usually can't be overriden + # Add things like /NOLOGO; usually can't be overridden commands += linker.get_linker_always_args() # Add buildtype linker args: optimization level, etc. commands += linker.get_buildtype_linker_args(self.get_option_for_target('buildtype', target)) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 5f552c251..8eb95dc13 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1137,7 +1137,7 @@ class GeneratedList: class Executable(BuildTarget): def __init__(self, name, subdir, subproject, is_cross, sources, objects, environment, kwargs): super().__init__(name, subdir, subproject, is_cross, sources, objects, environment, kwargs) - # Unless overriden, executables have no suffix or prefix. Except on + # Unless overridden, executables have no suffix or prefix. Except on # Windows and with C#/Mono executables where the suffix is 'exe' if not hasattr(self, 'prefix'): self.prefix = '' @@ -1746,7 +1746,7 @@ class Jar(BuildTarget): class CustomTargetIndex: - """A special opaque object returned by indexing a CustomTaget. This object + """A special opaque object returned by indexing a CustomTarget. This object exists in meson, but acts as a proxy in the backends, making targets depend on the CustomTarget it's derived from, but only adding one source file to the sources. diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 032ca6957..7087b3eb4 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -451,9 +451,9 @@ class CompilerArgs(list): Returns whether the argument can be safely de-duped. This is dependent on three things: - a) Whether an argument can be 'overriden' by a later argument. For + a) Whether an argument can be 'overridden' by a later argument. For example, -DFOO defines FOO and -UFOO undefines FOO. In this case, we - can safely remove the previous occurance and add a new one. The same + can safely remove the previous occurrence and add a new one. The same is true for include paths and library paths with -I and -L. For these we return `2`. See `dedup2_prefixes` and `dedup2_args`. b) Arguments that once specified cannot be undone, such as `-c` or @@ -511,10 +511,10 @@ class CompilerArgs(list): continue i = self.index(each) if group_start < 0: - # First occurance of a library + # First occurrence of a library group_start = i if group_start >= 0: - # Last occurance of a library + # Last occurrence of a library self.insert(i + 1, '-Wl,--end-group') self.insert(group_start, '-Wl,--start-group') return self.compiler.unix_args_to_native(self) @@ -548,15 +548,15 @@ class CompilerArgs(list): raise TypeError('can only concatenate list (not "{}") to list'.format(args)) for arg in args: # If the argument can be de-duped, do it either by removing the - # previous occurance of it and adding a new one, or not adding the - # new occurance. + # previous occurrence of it and adding a new one, or not adding the + # new occurrence. dedup = self._can_dedup(arg) if dedup == 1: # Argument already exists and adding a new instance is useless if arg in self or arg in pre or arg in post: continue if dedup == 2: - # Remove all previous occurances of the arg and add it anew + # Remove all previous occurrences of the arg and add it anew if arg in self: self.remove(arg) if arg in pre: @@ -605,7 +605,7 @@ class Compiler: self.exelist = exelist else: raise TypeError('Unknown argument to Compiler') - # In case it's been overriden by a child class already + # In case it's been overridden by a child class already if not hasattr(self, 'file_suffixes'): self.file_suffixes = lang_suffixes[self.language] if not hasattr(self, 'can_compile_suffixes'): diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 257bf7a17..a16149505 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -116,7 +116,7 @@ class LLVMDependency(ExternalDependency): """ # Ordered list of llvm-config binaries to try. Start with base, then try - # newest back to oldest (3.5 is abitrary), and finally the devel version. + # newest back to oldest (3.5 is arbitrary), and finally the devel version. # Please note that llvm-config-6.0 is a development snapshot and it should # not be moved to the beginning of the list. The only difference between # llvm-config-6.0 and llvm-config-devel is that the former is used by @@ -168,7 +168,7 @@ class LLVMDependency(ExternalDependency): mlog.log('Dependency LLVM found:', mlog.green('YES')) self.is_found = True - # Currently meson doesn't really atempt to handle pre-release versions, + # Currently meson doesn't really attempt to handle pre-release versions, # so strip the 'svn' off the end, since it will probably cuase problems # for users who want the patch version. self.version = out.strip().rstrip('svn') diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 58cc9b979..0cb1450e4 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -154,7 +154,7 @@ def detect_windows_arch(compilers): # Check if we're using and inside an MSVC toolchain environment if compiler.id == 'msvc' and 'VCINSTALLDIR' in os.environ: # 'Platform' is only set when the target arch is not 'x86'. - # It's 'x64' when targetting x86_64 and 'arm' when targetting ARM. + # It's 'x64' when targeting x86_64 and 'arm' when targeting ARM. platform = os.environ.get('Platform', 'x86').lower() if platform == 'x86': return platform diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 09b0f12fc..747b9d123 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -51,7 +51,7 @@ class Conf: with open(self.coredata_file, 'wb') as f: pickle.dump(self.coredata, f) # We don't write the build file because any changes to it - # are erased when Meson is executed the next time, i.e. whne + # are erased when Meson is executed the next time, i.e. when # Ninja is run. def print_aligned(self, arr): diff --git a/run_unittests.py b/run_unittests.py index fe7507470..be5ce47d8 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1958,7 +1958,7 @@ class LinuxlikeTests(BasePlatformTests): # Verify that -I flags from the `args` kwarg are first # This is set in the '43 has function' test case self.assertEqual(cmd[1], '-I/tmp') - # Verify that -O3 set via the environment is overriden by -O0 + # Verify that -O3 set via the environment is overridden by -O0 Oargs = [arg for arg in cmd if arg.startswith('-O')] self.assertEqual(Oargs, [Oflag, '-O0']) diff --git a/test cases/common/125 shared module/meson.build b/test cases/common/125 shared module/meson.build index d96d8fcae..29277e9e3 100644 --- a/test cases/common/125 shared module/meson.build +++ b/test cases/common/125 shared module/meson.build @@ -6,7 +6,7 @@ l = shared_library('runtime', 'runtime.c') # is a common approach for plugins that are only used # with dlopen. Any symbols are resolved dynamically # at runtime. This requires extra help on Windows, so -# should be avoided unless really neccessary. +# should be avoided unless really necessary. m = shared_module('mymodule', 'module.c') e = executable('prog', 'prog.c', link_with : l, dependencies : dl) test('import test', e, args : m) diff --git a/test cases/common/126 llvm ir and assembly/meson.build b/test cases/common/126 llvm ir and assembly/meson.build index 4ce463618..acff93f77 100644 --- a/test cases/common/126 llvm ir and assembly/meson.build +++ b/test cases/common/126 llvm ir and assembly/meson.build @@ -6,7 +6,7 @@ supported_cpus = ['arm', 'x86', 'x86_64'] foreach lang : ['c', 'cpp'] cc = meson.get_compiler(lang) cc_id = cc.get_id() - ## Build a trivial executale with mixed LLVM IR source + ## Build a trivial executable with mixed LLVM IR source if cc_id == 'clang' e = executable('square_ir_' + lang, 'square.ll', 'main.' + lang) test('test IR square' + lang, e) diff --git a/test cases/common/66 install subdir/subdir/meson.build b/test cases/common/66 install subdir/subdir/meson.build index 37d2da455..a1dadd4e5 100644 --- a/test cases/common/66 install subdir/subdir/meson.build +++ b/test cases/common/66 install subdir/subdir/meson.build @@ -1,3 +1,3 @@ install_subdir('sub1', install_dir : 'share', - # This mode will be overriden by the mode set in the outer install_subdir + # This mode will be overridden by the mode set in the outer install_subdir install_mode : 'rwxr-x---') diff --git a/test cases/common/68 number arithmetic/meson.build b/test cases/common/68 number arithmetic/meson.build index 02c7878f2..495a83e36 100644 --- a/test cases/common/68 number arithmetic/meson.build +++ b/test cases/common/68 number arithmetic/meson.build @@ -25,16 +25,16 @@ assert((5 % 2) == 1, 'Integer modulo (odd) is broken') assert((4 % 2) == 0, 'Integer modulo (even) is broken') if 2 * 1 % 2 != 0 - error('Modulo precendence with multiplication is broken') + error('Modulo precedence with multiplication is broken') endif if 2 + 1 % 2 != 3 - error('Modulo precendence with addition is broken') + error('Modulo precedence with addition is broken') endif if 9 / 9 % 2 != 1 - error('Modulo precendence with division is broken') + error('Modulo precedence with division is broken') endif if 9 - 9 % 2 != 8 - error('Modulo precendence with subtraction is broken') + error('Modulo precedence with subtraction is broken') endif assert(2.is_even(), 'int is_even() broken for even value') diff --git a/test cases/common/71 arithmetic bidmas/meson.build b/test cases/common/71 arithmetic bidmas/meson.build index 2a530c87e..c7334b48f 100644 --- a/test cases/common/71 arithmetic bidmas/meson.build +++ b/test cases/common/71 arithmetic bidmas/meson.build @@ -1,7 +1,7 @@ project('arithmetic bidmas', 'c') if 5 * 3 - 6 / 2 + 1 != 13 - error('Arithemtic bidmas broken') + error('Arithmetic bidmas broken') endif if 5 * (3 - 6 / 2) + 1 != 1 error('Arithmetic bidmas with brackets broken') diff --git a/test cases/failing/65 grab sibling/subprojects/b/sneaky.c b/test cases/failing/65 grab sibling/subprojects/b/sneaky.c index f1cb91679..46718c6cc 100644 --- a/test cases/failing/65 grab sibling/subprojects/b/sneaky.c +++ b/test cases/failing/65 grab sibling/subprojects/b/sneaky.c @@ -1,6 +1,6 @@ #include int main(int argc, char **argv) { - printf("I can only come into existance via trickery.\n"); + printf("I can only come into existence via trickery.\n"); return 0; } diff --git a/test cases/linuxlike/1 pkg-config/meson.build b/test cases/linuxlike/1 pkg-config/meson.build index 7e438211f..17feb219f 100644 --- a/test cases/linuxlike/1 pkg-config/meson.build +++ b/test cases/linuxlike/1 pkg-config/meson.build @@ -23,7 +23,7 @@ dep2 = declare_dependency(dependencies : dep) exe2 = executable('zlibprog2', 'prog.c', dependencies : dep2) test('zlibtest2', exe2) -# Try to find a nonexistant library to ensure requires:false works. +# Try to find a nonexistent library to ensure requires:false works. dep = dependency('nvakuhrabnsdfasdf', required : false) diff --git a/test cases/osx/3 has function xcode8/meson.build b/test cases/osx/3 has function xcode8/meson.build index 300d352bf..5fe3e5378 100644 --- a/test cases/osx/3 has function xcode8/meson.build +++ b/test cases/osx/3 has function xcode8/meson.build @@ -10,16 +10,16 @@ args_10_12 = ['-mmacosx-version-min=10.12'] + sdk_args # Test requires XCode 8 which has the MacOSX 10.12 SDK if cc.version().version_compare('>=8.0') if cc.has_function('clock_gettime', args : args_10_11, prefix : '#include ') - error('Should not have found clock_gettime via when targetting Mac OS X 10.11') + error('Should not have found clock_gettime via when targeting Mac OS X 10.11') endif if not cc.has_function('clock_gettime', args : args_10_12, prefix : '#include ') - error('Did NOT find clock_gettime via when targetting Mac OS X 10.12') + error('Did NOT find clock_gettime via when targeting Mac OS X 10.12') endif if not cc.has_function('clock_gettime', args : args_10_11) - error('Did NOT find clock_gettime w/o a prototype when targetting Mac OS X 10.11') + error('Did NOT find clock_gettime w/o a prototype when targeting Mac OS X 10.11') endif if not cc.has_function('clock_gettime', args : args_10_12) - error('Did NOT find clock_gettime w/o a prototype when targetting Mac OS X 10.12') + error('Did NOT find clock_gettime w/o a prototype when targeting Mac OS X 10.12') endif else message('Test needs XCode 8, skipping...')