Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

make doc improvements

  • Loading branch information...
commit 90d1e47323096b01ae78218e2ea21e7d68690cf8 1 parent 4144024
@ry ry authored
Showing with 18 additions and 16 deletions.
  1. +0 −2  .gitignore
  2. +18 −14 Makefile
View
2  .gitignore
@@ -5,8 +5,6 @@ tags
*.pyc
*.patch
doc/api.xml
-doc/api/*.html
-doc/changelog.html
tools/nodejs.pc
test/fixtures/hello.txt
tmp/
View
32 Makefile
@@ -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/*)))
-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):
mkdir -p $@
@@ -63,6 +74,9 @@ $(apidoc_dirs):
build/doc/api/assets/%: doc/api_assets/% build/doc/api/assets/
cp $< $@
+build/doc/%: doc/%
+ cp $< $@
+
build/doc/api/%.html: doc/api/%.markdown build/default/node $(apidoc_dirs) $(apiassets)
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)
-website_files = \
- 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
+build/doc/%:
website-upload: doc
- scp -r build/doc/* $(web_root)
- scp $(website_files) $(web_root)
+ scp -r build/* $(web_root)
docopen: build/doc/api/all.html
-google-chrome build/doc/api/all.html
@@ -128,4 +132,4 @@ bench-idle:
./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
Please sign in to comment.
Something went wrong with that request. Please try again.