[Docs] Fix Sphinx incremental build. Patch by Sean Silva!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163235 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/docs/Makefile.sphinx b/docs/Makefile.sphinx
index 21f6648..81c13de 100644
--- a/docs/Makefile.sphinx
+++ b/docs/Makefile.sphinx
@@ -46,6 +46,10 @@
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
+ @# FIXME: Remove this `cp` once HTML->Sphinx transition is completed.
+ @# Kind of a hack, but HTML-formatted docs are on the way out anyway.
+ @echo "Copying legacy HTML-formatted docs into $(BUILDDIR)/html"
+ @cp -a *.html tutorial $(BUILDDIR)/html
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml:
diff --git a/docs/llvm-theme/layout.html b/docs/_themes/llvm-theme/layout.html
similarity index 100%
rename from docs/llvm-theme/layout.html
rename to docs/_themes/llvm-theme/layout.html
diff --git a/docs/llvm-theme/static/contents.png b/docs/_themes/llvm-theme/static/contents.png
similarity index 100%
rename from docs/llvm-theme/static/contents.png
rename to docs/_themes/llvm-theme/static/contents.png
Binary files differ
diff --git a/docs/llvm-theme/static/llvm-theme.css b/docs/_themes/llvm-theme/static/llvm-theme.css
similarity index 100%
rename from docs/llvm-theme/static/llvm-theme.css
rename to docs/_themes/llvm-theme/static/llvm-theme.css
diff --git a/docs/llvm-theme/static/logo.png b/docs/_themes/llvm-theme/static/logo.png
similarity index 100%
rename from docs/llvm-theme/static/logo.png
rename to docs/_themes/llvm-theme/static/logo.png
Binary files differ
diff --git a/docs/llvm-theme/static/navigation.png b/docs/_themes/llvm-theme/static/navigation.png
similarity index 100%
rename from docs/llvm-theme/static/navigation.png
rename to docs/_themes/llvm-theme/static/navigation.png
Binary files differ
diff --git a/docs/llvm-theme/theme.conf b/docs/_themes/llvm-theme/theme.conf
similarity index 100%
rename from docs/llvm-theme/theme.conf
rename to docs/_themes/llvm-theme/theme.conf
diff --git a/docs/conf.py b/docs/conf.py
index f7b3a07..a1e9b5f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -98,7 +98,7 @@
#html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ["."]
+html_theme_path = ["_themes"]
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
@@ -134,18 +134,7 @@
# Additional templates that should be rendered to pages, maps page names to
# template names.
-#
-# We load all the old-school HTML documentation pages into Sphinx here.
-basedir = os.path.dirname(__file__)
-html_additional_pages = {}
-for directory in ('', 'tutorial'):
- for file in os.listdir(os.path.join(basedir, directory)):
- if not file.endswith('.html'):
- continue
-
- subpath = os.path.join(directory, file)
- name,_ = os.path.splitext(subpath)
- html_additional_pages[name] = subpath
+#html_additional_pages = {}
# If false, no module index is generated.
#html_domain_indices = True
@@ -226,6 +215,7 @@
# Automatically derive the list of man pages from the contents of the command
# guide subdirectory.
+basedir = os.path.dirname(__file__)
man_page_authors = "Maintained by The LLVM Team (http://llvm.org/)."
command_guide_subpath = 'CommandGuide'
command_guide_path = os.path.join(basedir, command_guide_subpath)
