summaryrefslogtreecommitdiffstats
path: root/doc/manual.asciidoc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-09-06 19:11:08 (GMT)
committerEvan Martin <martine@danga.com>2011-09-06 19:11:08 (GMT)
commitf1687612c61c34bbcdf3e7ad448f686e93986f1c (patch)
tree3aa79598e32c9d2c462c46f0e26eb71a9350d4e6 /doc/manual.asciidoc
parent5d697b9fae48c3c0add1644eddd3f0002ec722c4 (diff)
downloadNinja-f1687612c61c34bbcdf3e7ad448f686e93986f1c.zip
Ninja-f1687612c61c34bbcdf3e7ad448f686e93986f1c.tar.gz
Ninja-f1687612c61c34bbcdf3e7ad448f686e93986f1c.tar.bz2
update docs on other build system integration with recent news
Diffstat (limited to 'doc/manual.asciidoc')
-rw-r--r--doc/manual.asciidoc19
1 files changed, 9 insertions, 10 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 112aac5..1eba9e7 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -319,16 +319,15 @@ it will generate the appropriate syntax.
Integration with other build systems
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*gyp* A work-in-progress patch to http://gyp.googlecode.com[gyp, the
-system used to generate build files for the Chromium browser] to
-generate ninja files for Linux is available from
-https://github.com/martine/gyp/tree/ninja[my "ninja" branch of the
-upstream gyp project]. To use it, put that branch in place of
-Chromium's gyp, set `GYP_GENERATORS=ninja` in your environment, and
-run `./build/gyp_chromium` to regenerate the build files.
-
-*CMake*. I have heard from people who have been working on generating
-Ninja files from CMake, but I don't think it's in a working state yet.
+*gyp*. http://gyp.googlecode.com[gyp, the system used to generate build
+files for the Chromium browser] can generate ninja files for Linux.
+See http://code.google.com/p/chromium/wiki/NinjaBuild[the Chromium
+Ninja documentation] for details.
+
+*CMake*. Various people have worked on generating Ninja files from
+CMake. Currently, it sounds like
+https://github.com/pcc/CMake/tree/ninja-generator[pcc's branch] is the
+one to try.
*Autotools*. In theory, you could coax Automake into producing
.ninja files as well, but I haven't tried it. It may very well be the