Merge pull request #1549 from grahame/build-tutorial

build the tutorial if node.js is available
This commit is contained in:
Graydon Hoare 2012-01-17 12:42:47 -08:00
commit f14ee0b1b6
3 changed files with 27 additions and 0 deletions

View File

@ -148,6 +148,12 @@ else
endif
endif
ifeq ($(CFG_NODE),)
$(info cfg: no node found, omitting doc/tutorial/web)
else
DOCS += doc/tutorial/web/index.html
endif
ifeq ($(CFG_NATURALDOCS),)
$(info cfg: no naturaldocs found, omitting library doc build)
else

1
configure vendored
View File

@ -289,6 +289,7 @@ probe CFG_NATURALDOCS naturaldocs
probe CFG_LLNEXTGEN LLnextgen
probe CFG_PANDOC pandoc
probe CFG_PDFLATEX pdflatex
probe CFG_NODE node
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
then

View File

@ -42,6 +42,26 @@ doc/rust.pdf: doc/rust.tex
endif
ifdef CFG_NODE
doc/tutorial/web/index.html: doc/tutorial/args.md \
doc/tutorial/control.md \
doc/tutorial/data.md \
doc/tutorial/ffi.md \
doc/tutorial/func.md \
doc/tutorial/generic.md \
doc/tutorial/iface.md \
doc/tutorial/index.md \
doc/tutorial/intro.md \
doc/tutorial/mod.md \
doc/tutorial/setup.md \
doc/tutorial/syntax.md \
doc/tutorial/task.md \
doc/tutorial/test.md
$(Q)cd doc/tutorial && $(CFG_NODE) build.js
endif
endif
ifdef CFG_LLNEXTGEN