diff options
| author | bors <bors@rust-lang.org> | 2013-08-20 15:01:55 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-20 15:01:55 -0700 |
| commit | 3cd978fbc75a691a144dcafe99a08531a424fcd0 (patch) | |
| tree | 8356d2a75fc7d2784840df899365d02a3d146655 /mk | |
| parent | 293660d44347967cbb724d1ff94b90d635c2c64f (diff) | |
| parent | ef5d537010dbc7192b15e44ac01c62af45de4df9 (diff) | |
| download | rust-3cd978fbc75a691a144dcafe99a08531a424fcd0.tar.gz rust-3cd978fbc75a691a144dcafe99a08531a424fcd0.zip | |
auto merge of #8563 : graydon/rust/2013-08-16-condition-tutorial, r=catamorphism
First cut of a tutorial on conditions. cc: #6701
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/docs.mk | 10 | ||||
| -rw-r--r-- | mk/tests.mk | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mk/docs.mk b/mk/docs.mk index 16858628815..7e3da1c86b1 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -150,6 +150,16 @@ doc/tutorial-tasks.html: tutorial-tasks.md doc/version_info.html doc/rust.css --include-before-body=doc/version_info.html \ --output=$@ +DOCS += doc/tutorial-conditions.html +doc/tutorial-conditions.html: tutorial-conditions.md doc/version_info.html doc/rust.css + @$(call E, pandoc: $@) + $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ + $(CFG_PANDOC) --standalone --toc \ + --section-divs --number-sections \ + --from=markdown --to=html --css=rust.css \ + --include-before-body=doc/version_info.html \ + --output=$@ + ifeq ($(CFG_PDFLATEX),) $(info cfg: no pdflatex found, omitting doc/rust.pdf) else diff --git a/mk/tests.mk b/mk/tests.mk index e644248c370..4732f808457 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -19,7 +19,8 @@ TEST_HOST_CRATES = rust rusti rustpkg rustc rustdoc syntax TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES) # Markdown files under doc/ that should have their code extracted and run -DOC_TEST_NAMES = tutorial tutorial-ffi tutorial-macros tutorial-borrowed-ptr tutorial-tasks rust +DOC_TEST_NAMES = tutorial tutorial-ffi tutorial-macros tutorial-borrowed-ptr \ + tutorial-tasks tutorial-conditions rust ###################################################################### # Environment configuration |