Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-02-27 22:59:35 +0400
committerisaacs <i@izs.me>2012-03-01 03:18:51 +0400
commitffcdcc7ff067935642f37984dc8974aed9b4811f (patch)
treed1cd1fa56793215c0bfebb767ae27f66c3aef798 /Makefile
parent4051c2843b17f481374036be0860b870f52be75a (diff)
Use new doc generation tool
Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a28e9d6b2c0..42679e0b485 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,8 @@ test-npm-publish: all
out/Release/node: all
apidoc_sources = $(wildcard doc/api/*.markdown)
-apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
+apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) \
+ $(addprefix out/,$(apidoc_sources:.markdown=.json))
apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos out/doc/images
@@ -101,7 +102,7 @@ website_files = \
out/doc/logos/index.html \
$(doc_images)
-doc docs: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
+doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/
$(apidoc_dirs):
mkdir -p $@
@@ -112,8 +113,11 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
out/doc/%: doc/%
cp -r $< $@
-out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
- out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
+out/doc/api/%.json: doc/api/%.markdown
+ out/Release/node tools/doc/generate.js --format=json $< > $@
+
+out/doc/api/%.html: doc/api/%.markdown
+ out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
out/doc/%: