diff options
| -rw-r--r-- | docs/Makefile.sphinx | 4 | ||||
| -rw-r--r-- | docs/_themes/llvm-theme/layout.html (renamed from docs/llvm-theme/layout.html) | 0 | ||||
| -rw-r--r-- | docs/_themes/llvm-theme/static/contents.png (renamed from docs/llvm-theme/static/contents.png) | bin | 202 -> 202 bytes | |||
| -rw-r--r-- | docs/_themes/llvm-theme/static/llvm-theme.css (renamed from docs/llvm-theme/static/llvm-theme.css) | 0 | ||||
| -rw-r--r-- | docs/_themes/llvm-theme/static/logo.png (renamed from docs/llvm-theme/static/logo.png) | bin | 9864 -> 9864 bytes | |||
| -rw-r--r-- | docs/_themes/llvm-theme/static/navigation.png (renamed from docs/llvm-theme/static/navigation.png) | bin | 218 -> 218 bytes | |||
| -rw-r--r-- | docs/_themes/llvm-theme/theme.conf (renamed from docs/llvm-theme/theme.conf) | 0 | ||||
| -rw-r--r-- | docs/conf.py | 16 |
8 files changed, 7 insertions, 13 deletions
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 @@ clean: 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 index 746c2f5..746c2f5 100644 --- a/docs/llvm-theme/layout.html +++ b/docs/_themes/llvm-theme/layout.html diff --git a/docs/llvm-theme/static/contents.png b/docs/_themes/llvm-theme/static/contents.png Binary files differindex 7fb8215..7fb8215 100644 --- a/docs/llvm-theme/static/contents.png +++ b/docs/_themes/llvm-theme/static/contents.png diff --git a/docs/llvm-theme/static/llvm-theme.css b/docs/_themes/llvm-theme/static/llvm-theme.css index f684d00..f684d00 100644 --- a/docs/llvm-theme/static/llvm-theme.css +++ b/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 Binary files differindex 18d424c..18d424c 100644 --- a/docs/llvm-theme/static/logo.png +++ b/docs/_themes/llvm-theme/static/logo.png diff --git a/docs/llvm-theme/static/navigation.png b/docs/_themes/llvm-theme/static/navigation.png Binary files differindex 1081dc1..1081dc1 100644 --- a/docs/llvm-theme/static/navigation.png +++ b/docs/_themes/llvm-theme/static/navigation.png diff --git a/docs/llvm-theme/theme.conf b/docs/_themes/llvm-theme/theme.conf index 573fd78..573fd78 100644 --- a/docs/llvm-theme/theme.conf +++ b/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 = 'llvm-theme' #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 @@ html_sidebars = {'index': 'indexsidebar.html'} # 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 @@ man_pages = [] # 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) |
