dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto merge of #4822 : graydon/rust/doc-version-stamp, r=brson 

This just improves the version stamp, which was not being regenerated in cached workspaces even when the version changed. Also adds it to the pdf.
This commit is contained in:
bors 2013-02-07 02:47:14 -08:00
parent b3e182568f 79dc10dba9
commit fa69739320
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mk/docs.mk
View File

@ -45,7 +45,7 @@ doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.css
--from=markdown --to=html \ --from=markdown --to=html \
--css=rust.css \ --css=rust.css \
--css=manual.css \ --css=manual.css \
--include-before-body=doc/version_info.html \ --include-before-body=doc/version_info.html \
--output=$@ --output=$@
endif endif
@ -66,6 +66,7 @@ doc/rust.tex: rust.md doc/version.md
"$(CFG_PANDOC)" \ "$(CFG_PANDOC)" \
--standalone --toc \ --standalone --toc \
--number-sections \ --number-sections \
--include-before-body=doc/version.md \
--from=markdown --to=latex \ --from=markdown --to=latex \
--output=$@ --output=$@
@ -199,16 +200,17 @@ ifdef CFG_DISABLE_DOCS
endif endif
doc/version.md: $(MKFILE_DEPS) rust.md doc/version.md: $(MKFILE_DEPS) $(wildcard $(S)doc/*.*)
@$(call E, version-stamp: $@) @$(call E, version-stamp: $@)
$(Q)echo "$(CFG_VERSION)" >$@ $(Q)echo "$(CFG_VERSION)" >$@
doc/version_info.html: version_info.html.template doc/version_info.html: version_info.html.template $(MKFILE_DEPS) \
$(wildcard $(S)doc/*.*)
@$(call E, version-info: $@) @$(call E, version-info: $@)
sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \ sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
$(CFG_VER_HASH) | head -c 8)/;\ $(CFG_VER_HASH) | head -c 8)/;\
s/STAMP/$(CFG_VER_HASH)/;" $< >$@ s/STAMP/$(CFG_VER_HASH)/;" $< >$@
GENERATED += doc/version.md GENERATED += doc/version.md doc/version_info.html
docs: $(DOCS) docs: $(DOCS)