Skip to content

Commit

Permalink
rust_version.html is a HTML_DEPS and every html has it as dependecy
Browse files Browse the repository at this point in the history
  • Loading branch information
@alan-andrade
alan-andrade committed Jan 6, 2014
1 parent e53b566 commit 7de2379
Showing 1 changed file with 29 additions and 34 deletions.
63 changes: 29 additions & 34 deletions mk/docs.mk
View file
Expand Up @@ -24,6 +24,23 @@ HTML_OPTS = $(BASE_DOC_OPTS) --to=html5 --section-divs --css=rust.css \
TEX_OPTS = $(BASE_DOC_OPTS) --to=latex
EPUB_OPTS = $(BASE_DOC_OPTS) --to=epub

######################################################################
# Rust version
######################################################################
doc/version.md: $(MKFILE_DEPS) $(wildcard $(S)doc/*.*)
@$(call E, version-stamp: $@)
$(Q)echo "$(CFG_VERSION)" >$@

HTML_DEPS += doc/version_info.html
doc/version_info.html: version_info.html.template $(MKFILE_DEPS) \
$(wildcard $(S)doc/*.*)
@$(call E, version-info: $@)
sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
$(CFG_VER_HASH) | head -c 8)/;\
s/STAMP/$(CFG_VER_HASH)/;" $< >$@

GENERATED += doc/version.md doc/version_info.html

######################################################################
# Docs, from pandoc, rustdoc (which runs pandoc), and node
######################################################################
Expand Down Expand Up @@ -55,7 +72,7 @@ endif
ifneq ($(NO_DOCS),1)

DOCS += doc/rust.html
doc/rust.html: rust.md doc/version_info.html doc/full-toc.inc $(HTML_DEPS)
doc/rust.html: rust.md doc/full-toc.inc $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --include-in-header=doc/full-toc.inc --output=$@
Expand All @@ -73,19 +90,19 @@ doc/rust.epub: rust.md doc/version_info.html doc/rust.css
$(CFG_PANDOC) $(EPUB_OPTS) --output=$@

DOCS += doc/rustpkg.html
doc/rustpkg.html: rustpkg.md doc/version_info.html $(HTML_DEPS)
doc/rustpkg.html: rustpkg.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/rustdoc.html
doc/rustdoc.html: rustdoc.md doc/version_info.html $(HTML_DEPS)
doc/rustdoc.html: rustdoc.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/tutorial.html
doc/tutorial.html: tutorial.md doc/version_info.html $(HTML_DEPS)
doc/tutorial.html: tutorial.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@
Expand Down Expand Up @@ -154,57 +171,49 @@ doc/complement-bugreport.html: $(S)doc/complement-bugreport.md $(HTML_DEPS)
# Guides

DOCS += doc/guide-macros.html
doc/guide-macros.html: $(S)doc/guide-macros.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-macros.html: $(S)doc/guide-macros.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-container.html
doc/guide-container.html: $(S)doc/guide-container.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-container.html: $(S)doc/guide-container.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-ffi.html
doc/guide-ffi.html: $(S)doc/guide-ffi.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-ffi.html: $(S)doc/guide-ffi.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-testing.html
doc/guide-testing.html: $(S)doc/guide-testing.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-testing.html: $(S)doc/guide-testing.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-borrowed-ptr.html
doc/guide-borrowed-ptr.html: $(S)doc/guide-borrowed-ptr.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-borrowed-ptr.html: $(S)doc/guide-borrowed-ptr.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-tasks.html
doc/guide-tasks.html: $(S)doc/guide-tasks.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-tasks.html: $(S)doc/guide-tasks.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-conditions.html
doc/guide-conditions.html: $(S)doc/guide-conditions.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-conditions.html: $(S)doc/guide-conditions.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@

DOCS += doc/guide-rustpkg.html
doc/guide-rustpkg.html: $(S)doc/guide-rustpkg.md doc/version_info.html doc/rust.css \
doc/favicon.inc
doc/guide-rustpkg.html: $(S)doc/guide-rustpkg.md $(HTML_DEPS)
@$(call E, pandoc: $@)
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
$(CFG_PANDOC) $(HTML_OPTS) --output=$@
Expand Down Expand Up @@ -303,20 +312,6 @@ ifdef CFG_DISABLE_DOCS
DOCS :=
endif


doc/version.md: $(MKFILE_DEPS) $(wildcard $(S)doc/*.*)
@$(call E, version-stamp: $@)
$(Q)echo "$(CFG_VERSION)" >$@

doc/version_info.html: version_info.html.template $(MKFILE_DEPS) \
$(wildcard $(S)doc/*.*)
@$(call E, version-info: $@)
sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
$(CFG_VER_HASH) | head -c 8)/;\
s/STAMP/$(CFG_VER_HASH)/;" $< >$@

GENERATED += doc/version.md doc/version_info.html

docs: $(DOCS)
compiler-docs: $(CDOCS)

Expand Down

5 comments on commit 7de2379

@bors
Copy link
Contributor

@bors bors commented on 7de2379 Jan 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at alan-andrade@7de2379

@bors
Copy link
Contributor

@bors bors commented on 7de2379 Jan 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alan-andrade/rust/move_wiki_to_internal_docs = 7de2379 into auto

@bors
Copy link
Contributor

@bors bors commented on 7de2379 Jan 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alan-andrade/rust/move_wiki_to_internal_docs = 7de2379 merged ok, testing candidate = 1f1838e

@bors
Copy link
Contributor

@bors bors commented on 7de2379 Jan 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3404
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1247
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1250
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3407
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2509
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2512
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3423
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2512
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2517
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3425
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2512
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2516
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2586
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3412
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2514
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2518
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3186

@bors
Copy link
Contributor

@bors bors commented on 7de2379 Jan 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 1f1838e

Please sign in to comment.