diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /ninja/doc | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'ninja/doc')
| -rw-r--r-- | ninja/doc/manual.asciidoc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ninja/doc/manual.asciidoc b/ninja/doc/manual.asciidoc index aa5644d6451..a7352571c84 100644 --- a/ninja/doc/manual.asciidoc +++ b/ninja/doc/manual.asciidoc @@ -54,7 +54,7 @@ Here are the design goals of Ninja: higher-level build systems have different opinions about how code should be built; for example, should built objects live alongside the sources or should all build output go into a separate directory? - Is there an "package" rule that builds a distributable package of + Is there a "package" rule that builds a distributable package of the project? Sidestep these decisions by trying to allow either to be implemented, rather than choosing, even if that results in more verbosity. @@ -588,6 +588,7 @@ rule cc command = cl /showIncludes -c $in /Fo$out ---- +[[ref_pool]] Pools ~~~~~ @@ -668,6 +669,9 @@ A file is a series of declarations. A declaration can be one of: +include _path_+. The difference between these is explained below <<ref_scope,in the discussion about scoping>>. +6. A pool declaration, which looks like +pool _poolname_+. Pools are explained + <<ref_pool, in the section on pools>>. + Lexical syntax ~~~~~~~~~~~~~~ |