make doc improvements

pull/22966/head
Ryan Dahl 2010-11-15 20:23:12 -08:00
parent 4144024e6b
commit 90d1e47323
2 changed files with 18 additions and 16 deletions

2
.gitignore vendored
View File

@ -5,8 +5,6 @@ tags
*.pyc *.pyc
*.patch *.patch
doc/api.xml doc/api.xml
doc/api/*.html
doc/changelog.html
tools/nodejs.pc tools/nodejs.pc
test/fixtures/hello.txt test/fixtures/hello.txt
tmp/ tmp/

View File

@ -55,7 +55,18 @@ apidoc_dirs = build/doc build/doc/api/ build/doc/api/assets
apiassets = $(subst api_assets,api/assets,$(addprefix build/,$(wildcard doc/api_assets/*))) apiassets = $(subst api_assets,api/assets,$(addprefix build/,$(wildcard doc/api_assets/*)))
doc: build/default/node $(apidoc_dirs) $(apiassets) $(apidocs) build/doc/changelog.html website_files = \
build/doc/index.html \
build/doc/cla.html \
build/doc/jquery.js \
build/doc/sh_main.js \
build/doc/sh_javascript.min.js \
build/doc/sh_vim-dark.css \
build/doc/logo.png \
build/doc/sponsored.png \
build/doc/pipe.css
doc: build/default/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) build/doc/changelog.html
$(apidoc_dirs): $(apidoc_dirs):
mkdir -p $@ mkdir -p $@
@ -63,6 +74,9 @@ $(apidoc_dirs):
build/doc/api/assets/%: doc/api_assets/% build/doc/api/assets/ build/doc/api/assets/%: doc/api_assets/% build/doc/api/assets/
cp $< $@ cp $< $@
build/doc/%: doc/%
cp $< $@
build/doc/api/%.html: doc/api/%.markdown build/default/node $(apidoc_dirs) $(apiassets) build/doc/api/%.html: doc/api/%.markdown build/default/node $(apidoc_dirs) $(apiassets)
build/default/node tools/doctool/doctool.js doc/template.html $< > $@ build/default/node tools/doctool/doctool.js doc/template.html $< > $@
@ -73,20 +87,10 @@ build/doc/changelog.html: ChangeLog build/default/node build/doc/ $(apidoc_dirs)
@echo $(apiassets) @echo $(apiassets)
website_files = \ build/doc/%:
doc/index.html \
doc/cla.html \
doc/jquery.js \
doc/sh_main.js \
doc/sh_javascript.min.js \
doc/sh_vim-dark.css \
doc/logo.png \
doc/sponsored.png \
doc/pipe.css
website-upload: doc website-upload: doc
scp -r build/doc/* $(web_root) scp -r build/* $(web_root)
scp $(website_files) $(web_root)
docopen: build/doc/api/all.html docopen: build/doc/api/all.html
-google-chrome build/doc/api/all.html -google-chrome build/doc/api/all.html
@ -128,4 +132,4 @@ bench-idle:
./node benchmark/idle_clients.js & ./node benchmark/idle_clients.js &
.PHONY: bench clean docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload .PHONY: bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload