This commit is contained in:
Matt Selsky 2017-02-16 01:03:43 -05:00 committed by ita1024
parent ede9ac0740
commit b0524d1a6f
13 changed files with 17 additions and 17 deletions

View File

@ -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

View File

@ -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

View File

@ -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"""

View File

@ -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

2
waflib/Tools/c_config.py Normal file → Executable file
View File

@ -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):

View File

@ -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')

View File

@ -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'])

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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).

View File

@ -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

View File

@ -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),