From b0524d1a6fce4768fd073273f708bf27fe76a936 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Thu, 16 Feb 2017 01:03:43 -0500 Subject: [PATCH] Typos --- waflib/Build.py | 2 +- waflib/Options.py | 2 +- waflib/Task.py | 2 +- waflib/TaskGen.py | 2 +- waflib/Tools/c_config.py | 2 +- waflib/Tools/cs.py | 2 +- waflib/Tools/ifort.py | 2 +- waflib/Tools/msvc.py | 4 ++-- waflib/ansiterm.py | 4 ++-- waflib/extras/fluid.py | 2 +- waflib/extras/objcopy.py | 2 +- waflib/extras/remote.py | 2 +- waflib/extras/xcode6.py | 6 +++--- 13 files changed, 17 insertions(+), 17 deletions(-) mode change 100644 => 100755 waflib/Tools/c_config.py diff --git a/waflib/Build.py b/waflib/Build.py index e69c1ee2..c68f902d 100644 --- a/waflib/Build.py +++ b/waflib/Build.py @@ -799,7 +799,7 @@ class BuildContext(Context.Context): """ Creates a Python generator object that returns lists of tasks that may be processed in parallel. - :return: tasks which can be executed immediatly + :return: tasks which can be executed immediately :rtype: generator returning lists of :py:class:`waflib.Task.TaskBase` """ self.cur = 0 diff --git a/waflib/Options.py b/waflib/Options.py index baa0414c..175104db 100644 --- a/waflib/Options.py +++ b/waflib/Options.py @@ -245,7 +245,7 @@ class OptionsContext(Context.Context): def parse_args(self, _args=None): """ - Parses arguments from a list which is not necesarily the command-line. + Parses arguments from a list which is not necessarily the command-line. :param _args: arguments :type _args: list of strings diff --git a/waflib/Task.py b/waflib/Task.py index 2172b508..3c544db0 100644 --- a/waflib/Task.py +++ b/waflib/Task.py @@ -20,7 +20,7 @@ CRASHED = 2 """The task execution returned a non-zero exit status""" EXCEPTION = 3 -"""An exception occured in the task execution""" +"""An exception occurred in the task execution""" SKIPPED = 8 """The task did not have to be executed""" diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py index 7b279d3d..a9bac371 100644 --- a/waflib/TaskGen.py +++ b/waflib/TaskGen.py @@ -325,7 +325,7 @@ def declare_chain(name='', rule=None, reentrant=None, color='BLUE', :type before: list of string :param after: execute instances of this task after classes of the given names :type after: list of string - :param decider: if present, function that retuns a list of output file extensions (overrides ext_out for output files, but not for the build order) + :param decider: if present, function that returns a list of output file extensions (overrides ext_out for output files, but not for the build order) :type decider: function :param scan: scanner function for the task :type scan: function diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py old mode 100644 new mode 100755 index a9b00539..9eb6a56a --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -714,7 +714,7 @@ def check(self, *k, **kw): For the complete list of parameters, see :py:func:`waflib.Tools.c_config.validate_c`. To force a specific compiler, pass ``compiler='c'`` or ``compiler='cxx'`` to the list of arguments - Besides build targets, complete builds can be given though a build function. All files will + Besides build targets, complete builds can be given through a build function. All files will be written to a temporary directory:: def build(bld): diff --git a/waflib/Tools/cs.py b/waflib/Tools/cs.py index daa08d52..ad5e9ef6 100644 --- a/waflib/Tools/cs.py +++ b/waflib/Tools/cs.py @@ -80,7 +80,7 @@ def use_cs(self): if not tsk: self.bld.fatal('cs task has no link task for use %r' % self) self.cs_task.dep_nodes.extend(tsk.outputs) # dependency - self.cs_task.set_run_after(tsk) # order (redundant, the order is infered from the nodes inputs/outputs) + self.cs_task.set_run_after(tsk) # order (redundant, the order is inferred from the nodes inputs/outputs) self.env.append_value('CSFLAGS', '/reference:%s' % tsk.outputs[0].abspath()) @feature('cs') diff --git a/waflib/Tools/ifort.py b/waflib/Tools/ifort.py index 734c2223..77701d67 100644 --- a/waflib/Tools/ifort.py +++ b/waflib/Tools/ifort.py @@ -224,7 +224,7 @@ echo LIB=%%LIB%%;%%LIBPATH%% compiler_name, linker_name, lib_name = _get_prog_names(conf, compiler) fc = conf.find_program(compiler_name, path_list=MSVC_PATH) - # delete CL if exists. because it could contain parameters wich can change cl's behaviour rather catastrophically. + # delete CL if exists. because it could contain parameters which can change cl's behaviour rather catastrophically. if 'CL' in env: del(env['CL']) diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py index 02656876..05d5875c 100644 --- a/waflib/Tools/msvc.py +++ b/waflib/Tools/msvc.py @@ -198,7 +198,7 @@ echo LIB=%%LIB%%;%%LIBPATH%% compiler_name, linker_name, lib_name = _get_prog_names(conf, compiler) cxx = conf.find_program(compiler_name, path_list=MSVC_PATH) - # delete CL if exists. because it could contain parameters wich can change cl's behaviour rather catastrophically. + # delete CL if exists. because it could contain parameters which can change cl's behaviour rather catastrophically. if 'CL' in env: del(env['CL']) @@ -664,7 +664,7 @@ def libname_msvc(self, libname, is_static=False): if lt_path != None and lt_libname != None: if lt_static == True: - # file existance check has been made by find_lt_names + # file existence check has been made by find_lt_names return os.path.join(lt_path,lt_libname) if lt_path != None: diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py index ac650eaa..0d20c637 100644 --- a/waflib/ansiterm.py +++ b/waflib/ansiterm.py @@ -120,7 +120,7 @@ else: def clear_line(self, param): mode = param and int(param) or 0 sbinfo = self.screen_buffer_info() - if mode == 1: # Clear from begining of line to cursor position + if mode == 1: # Clear from beginning of line to cursor position line_start = COORD(0, sbinfo.CursorPosition.Y) line_length = sbinfo.Size.X elif mode == 2: # Clear entire line @@ -136,7 +136,7 @@ else: def clear_screen(self, param): mode = to_int(param, 0) sbinfo = self.screen_buffer_info() - if mode == 1: # Clear from begining of screen to cursor position + if mode == 1: # Clear from beginning of screen to cursor position clear_start = COORD(0, 0) clear_length = sbinfo.CursorPosition.X * sbinfo.CursorPosition.Y elif mode == 2: # Clear entire screen and return cursor to home diff --git a/waflib/extras/fluid.py b/waflib/extras/fluid.py index adcd9e2e..4814a35b 100644 --- a/waflib/extras/fluid.py +++ b/waflib/extras/fluid.py @@ -3,7 +3,7 @@ # Grygoriy Fuchedzhy 2009 """ -Compile fluid files (fltk graphic library). Use the 'fluid' feature in conjuction with the 'cxx' feature. +Compile fluid files (fltk graphic library). Use the 'fluid' feature in conjunction with the 'cxx' feature. """ from waflib import Task diff --git a/waflib/extras/objcopy.py b/waflib/extras/objcopy.py index f6f5071f..82d8359e 100644 --- a/waflib/extras/objcopy.py +++ b/waflib/extras/objcopy.py @@ -3,7 +3,7 @@ """ Support for converting linked targets to ihex, srec or binary files using -objcopy. Use the 'objcopy' feature in conjuction with the 'cc' or 'cxx' +objcopy. Use the 'objcopy' feature in conjunction with the 'cc' or 'cxx' feature. The 'objcopy' feature uses the following attributes: objcopy_bfdname Target object format name (eg. ihex, srec, binary). diff --git a/waflib/extras/remote.py b/waflib/extras/remote.py index de9269bf..3b038f77 100644 --- a/waflib/extras/remote.py +++ b/waflib/extras/remote.py @@ -76,7 +76,7 @@ Usage 4. Setup the ssh server and ssh keys - The ssh key should not be protected by a password, or it will prompt for it everytime. + The ssh key should not be protected by a password, or it will prompt for it every time. Create the key on the client: .. code:: bash diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py index 79cc129b..a785ed17 100644 --- a/waflib/extras/xcode6.py +++ b/waflib/extras/xcode6.py @@ -418,7 +418,7 @@ class PBXProject(XCodeNode): if not isinstance(env.PROJ_CONFIGURATION, dict): raise Errors.WafError("Error: env.PROJ_CONFIGURATION must be a dictionary. This is done for you if you do not define one yourself. However, did you load the xcode module at the end of your wscript configure() ?") - # Retreive project configuration + # Retrieve project configuration configurations = [] for config_name, settings in env.PROJ_CONFIGURATION.items(): cf = XCBuildConfiguration(config_name, settings) @@ -588,7 +588,7 @@ class xcode(Build.BuildContext): target.add_build_phase(PBXSourcesBuildPhase(buildfiles)) # Create build settings which can override the project settings. Defaults to none if user - # did not pass argument. However, this will be filled up further below with target specfic + # did not pass argument. However, this will be filled up further below with target specific # search paths, libs to link etc. settings = getattr(tg, 'settings', {}) @@ -614,7 +614,7 @@ class xcode(Build.BuildContext): ld_flags = ['-framework %s' % lib.split('.framework')[0] for lib in Utils.to_list(tg.env.FRAMEWORK)] ld_flags.extend(Utils.to_list(tg.env.STLIB) + Utils.to_list(tg.env.LIB)) - # Override target specfic build settings + # Override target specific build settings bldsettings = { 'HEADER_SEARCH_PATHS': ['$(inherited)'] + tg.env['INCPATHS'], 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(tg.env.LIBPATH) + Utils.to_list(tg.env.STLIBPATH),