summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-02-27 10:59:35 -0800
committerisaacs <i@izs.me>2012-02-27 10:59:35 -0800
commit7d6d5e263e8cea5c34f6cb6947e7264ced0d6381 (patch)
tree981109ba189dc1ac11defd0dea3599f2c2a77c60 /Makefile
parent964d03bc3f09dbbdcd1569fbf63bc03f67542f08 (diff)
downloadnodejs-7d6d5e263e8cea5c34f6cb6947e7264ced0d6381.tar.gz
nodejs-7d6d5e263e8cea5c34f6cb6947e7264ced0d6381.tar.bz2
nodejs-7d6d5e263e8cea5c34f6cb6947e7264ced0d6381.zip
Use new doc generation tool
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 791383e93..da628d24b 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,8 @@ test-npm-publish: node
npm_package_config_publishtest=true ./node deps/npm/test/run.js
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
@@ -115,7 +116,7 @@ website_files = \
out/doc/logos/index.html \
$(doc_images)
-doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
+doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/
$(apidoc_dirs):
mkdir -p $@
@@ -126,8 +127,11 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
out/doc/%: doc/%
cp -r $< $@
-out/doc/api/%.html: doc/api/%.markdown 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 $< > $@
website-upload: doc
rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/