Merge branch 'typos' into 'master'

Typos

See merge request ita1024/waf!2219
This commit is contained in:
ita1024 2019-03-08 06:41:22 +00:00
commit 503db290b7
3 changed files with 3 additions and 3 deletions

View File

@ -111,7 +111,7 @@ def apply_incpaths(self):
tg = bld(features='includes', includes='.') tg = bld(features='includes', includes='.')
The folders only need to be relative to the current directory, the equivalent build directory is The folders only need to be relative to the current directory, the equivalent build directory is
added automatically (for headers created in the build directory). This enable using a build directory added automatically (for headers created in the build directory). This enables using a build directory
or not (``top == out``). or not (``top == out``).
This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``, This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``,

View File

@ -209,7 +209,7 @@ def java_use_rec(self, name, **kw):
else: else:
y.post() y.post()
# Add generated JAR name for CLASSPATH. Task ordering (set_run_after) # Add generated JAR name for CLASSPATH. Task ordering (set_run_after)
# is already guaranted by ordering done between the single tasks # is already guaranteed by ordering done between the single tasks
if hasattr(y, 'jar_task'): if hasattr(y, 'jar_task'):
self.use_lst.append(y.jar_task.outputs[0].abspath()) self.use_lst.append(y.jar_task.outputs[0].abspath())

View File

@ -17,7 +17,7 @@ Usage::
def options(opt): def options(opt):
opt.load('fast_partial') opt.load('fast_partial')
Assuptions: Assumptions:
* Mostly for C/C++/Fortran targets with link tasks (object-only targets are not handled) * Mostly for C/C++/Fortran targets with link tasks (object-only targets are not handled)
* For full project builds: no --targets and no pruning from subfolders * For full project builds: no --targets and no pruning from subfolders
* The installation phase is ignored * The installation phase is ignored