From 58aa18c8bac34c8679514496a1388547b0dddeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20T=C3=A9tar?= Date: Mon, 11 Nov 2013 16:13:56 +0100 Subject: [PATCH] doc: add favicon to tutorial/manual Since tutorial/manual files are stored on static.rust-lang.org, browsers try to fetch the favicon from there while it should be retrieved from the main domain. --- doc/favicon.inc | 1 + mk/docs.mk | 89 ++++++++++++++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 34 deletions(-) create mode 100644 doc/favicon.inc diff --git a/doc/favicon.inc b/doc/favicon.inc new file mode 100644 index 00000000000..8dd05620e48 --- /dev/null +++ b/doc/favicon.inc @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mk/docs.mk b/mk/docs.mk index 621d283ee5d..413715579e2 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -28,6 +28,10 @@ doc/manual.inc: manual.inc @$(call E, cp: $@) $(Q)cp -a $< $@ 2> /dev/null +doc/favicon.inc: favicon.inc + @$(call E, cp: $@) + $(Q)cp -a $< $@ 2> /dev/null + ifeq ($(CFG_PANDOC),) $(info cfg: no pandoc found, omitting docs) NO_DOCS = 1 @@ -41,7 +45,8 @@ endif ifneq ($(NO_DOCS),1) DOCS += doc/rust.html -doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.inc +doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.inc \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ "$(CFG_PANDOC)" \ @@ -50,6 +55,7 @@ doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.inc --number-sections \ --from=markdown --to=html5 \ --css=rust.css --include-in-header=doc/manual.inc \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@ @@ -73,10 +79,35 @@ doc/rust.epub: rust.md doc/version_info.html doc/rust.css doc/manual.inc --section-divs \ --number-sections \ --from=markdown --to=epub \ - --css=rust.css --include-in-header=doc/manual.inc \ --include-before-body=doc/version_info.html \ --output=$@ +DOCS += doc/rustpkg.html +doc/rustpkg.html: rustpkg.md doc/version_info.html doc/rust.css doc/manual.inc \ + doc/favicon.inc + @$(call E, pandoc: $@) + $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ + "$(CFG_PANDOC)" \ + --standalone --toc \ + --section-divs \ + --number-sections \ + --from=markdown --to=html5 \ + --css=rust.css --include-in-header=doc/manual.inc \ + --include-in-header=doc/favicon.inc \ + --include-before-body=doc/version_info.html \ + --output=$@ + +DOCS += doc/tutorial.html +doc/tutorial.html: tutorial.md doc/version_info.html doc/rust.css \ + doc/favicon.inc + @$(call E, pandoc: $@) + $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ + $(CFG_PANDOC) --standalone --toc \ + --section-divs --number-sections \ + --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ + --include-before-body=doc/version_info.html \ + --output=$@ DOCS += doc/tutorial.tex doc/tutorial.tex: tutorial.md doc/version.md @@ -89,36 +120,13 @@ doc/tutorial.tex: tutorial.md doc/version.md --from=markdown --to=latex \ --output=$@ -DOCS += doc/rustpkg.html -doc/rustpkg.html: rustpkg.md doc/version_info.html doc/rust.css doc/manual.inc - @$(call E, pandoc: $@) - $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ - "$(CFG_PANDOC)" \ - --standalone --toc \ - --section-divs \ - --number-sections \ - --from=markdown --to=html5 \ - --css=rust.css --include-in-header=doc/manual.inc \ - --include-before-body=doc/version_info.html \ - --output=$@ - -DOCS += doc/tutorial.html -doc/tutorial.html: tutorial.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=html5 --css=rust.css \ - --include-before-body=doc/version_info.html \ - --output=$@ - DOCS += doc/tutorial.epub doc/tutorial.epub: tutorial.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=epub --css=rust.css \ + --from=markdown --to=epub \ --include-before-body=doc/version_info.html \ --output=$@ @@ -134,73 +142,86 @@ doc/l10n/ja/tutorial.html: doc/l10n/ja/tutorial.md doc/version_info.html doc/rus --output=$@ DOCS += doc/tutorial-macros.html -doc/tutorial-macros.html: tutorial-macros.md doc/version_info.html \ - doc/rust.css +doc/tutorial-macros.html: tutorial-macros.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@ DOCS += doc/tutorial-container.html -doc/tutorial-container.html: tutorial-container.md doc/version_info.html doc/rust.css +doc/tutorial-container.html: tutorial-container.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@ DOCS += doc/tutorial-ffi.html -doc/tutorial-ffi.html: tutorial-ffi.md doc/version_info.html doc/rust.css +doc/tutorial-ffi.html: tutorial-ffi.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@ DOCS += doc/tutorial-borrowed-ptr.html -doc/tutorial-borrowed-ptr.html: tutorial-borrowed-ptr.md doc/version_info.html doc/rust.css +doc/tutorial-borrowed-ptr.html: tutorial-borrowed-ptr.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@ DOCS += doc/tutorial-tasks.html -doc/tutorial-tasks.html: tutorial-tasks.md doc/version_info.html doc/rust.css +doc/tutorial-tasks.html: tutorial-tasks.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --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 +doc/tutorial-conditions.html: tutorial-conditions.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@ DOCS += doc/tutorial-rustpkg.html -doc/tutorial-rustpkg.html: tutorial-rustpkg.md doc/version_info.html doc/rust.css +doc/tutorial-rustpkg.html: tutorial-rustpkg.md doc/version_info.html doc/rust.css \ + doc/favicon.inc @$(call E, pandoc: $@) $(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \ $(CFG_PANDOC) --standalone --toc \ --section-divs --number-sections \ --from=markdown --to=html5 --css=rust.css \ + --include-in-header=doc/favicon.inc \ --include-before-body=doc/version_info.html \ --output=$@