[llvm-commits] [llvm] r163235 - in /llvm/trunk/docs: Makefile.sphinx _themes/ _themes/llvm-theme/ _themes/llvm-theme/layout.html _themes/llvm-theme/static/ _themes/llvm-theme/static/contents.png _themes/llvm-theme/static/llvm-theme.css _themes/llvm-theme/static/logo.png _themes/llvm-theme/static/navigation.png _themes/llvm-theme/theme.conf conf.py llvm-theme/layout.html llvm-theme/static/contents.png llvm-theme/static/llvm-theme.css llvm-theme/static/logo.png llvm-theme/static/navigation.png llvm-theme/theme.conf
Michael J. Spencer
bigcheesegs at gmail.com
Wed Sep 5 12:44:47 PDT 2012
Author: mspencer
Date: Wed Sep 5 14:44:47 2012
New Revision: 163235
URL: http://llvm.org/viewvc/llvm-project?rev=163235&view=rev
Log:
[Docs] Fix Sphinx incremental build. Patch by Sean Silva!
Added:
llvm/trunk/docs/_themes/
llvm/trunk/docs/_themes/llvm-theme/
llvm/trunk/docs/_themes/llvm-theme/layout.html
- copied, changed from r163234, llvm/trunk/docs/llvm-theme/layout.html
llvm/trunk/docs/_themes/llvm-theme/static/
llvm/trunk/docs/_themes/llvm-theme/static/contents.png
- copied, changed from r163234, llvm/trunk/docs/llvm-theme/static/contents.png
llvm/trunk/docs/_themes/llvm-theme/static/llvm-theme.css
- copied, changed from r163234, llvm/trunk/docs/llvm-theme/static/llvm-theme.css
llvm/trunk/docs/_themes/llvm-theme/static/logo.png
- copied, changed from r163234, llvm/trunk/docs/llvm-theme/static/logo.png
llvm/trunk/docs/_themes/llvm-theme/static/navigation.png
- copied, changed from r163234, llvm/trunk/docs/llvm-theme/static/navigation.png
llvm/trunk/docs/_themes/llvm-theme/theme.conf
- copied, changed from r163234, llvm/trunk/docs/llvm-theme/theme.conf
Removed:
llvm/trunk/docs/llvm-theme/layout.html
llvm/trunk/docs/llvm-theme/static/contents.png
llvm/trunk/docs/llvm-theme/static/llvm-theme.css
llvm/trunk/docs/llvm-theme/static/logo.png
llvm/trunk/docs/llvm-theme/static/navigation.png
llvm/trunk/docs/llvm-theme/theme.conf
Modified:
llvm/trunk/docs/Makefile.sphinx
llvm/trunk/docs/conf.py
Modified: llvm/trunk/docs/Makefile.sphinx
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Makefile.sphinx?rev=163235&r1=163234&r2=163235&view=diff
==============================================================================
--- llvm/trunk/docs/Makefile.sphinx (original)
+++ llvm/trunk/docs/Makefile.sphinx Wed Sep 5 14:44:47 2012
@@ -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:
Copied: llvm/trunk/docs/_themes/llvm-theme/layout.html (from r163234, llvm/trunk/docs/llvm-theme/layout.html)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/_themes/llvm-theme/layout.html?p2=llvm/trunk/docs/_themes/llvm-theme/layout.html&p1=llvm/trunk/docs/llvm-theme/layout.html&r1=163234&r2=163235&rev=163235&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/docs/_themes/llvm-theme/static/contents.png (from r163234, llvm/trunk/docs/llvm-theme/static/contents.png)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/_themes/llvm-theme/static/contents.png?p2=llvm/trunk/docs/_themes/llvm-theme/static/contents.png&p1=llvm/trunk/docs/llvm-theme/static/contents.png&r1=163234&r2=163235&rev=163235&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/docs/_themes/llvm-theme/static/llvm-theme.css (from r163234, llvm/trunk/docs/llvm-theme/static/llvm-theme.css)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/_themes/llvm-theme/static/llvm-theme.css?p2=llvm/trunk/docs/_themes/llvm-theme/static/llvm-theme.css&p1=llvm/trunk/docs/llvm-theme/static/llvm-theme.css&r1=163234&r2=163235&rev=163235&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/docs/_themes/llvm-theme/static/logo.png (from r163234, llvm/trunk/docs/llvm-theme/static/logo.png)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/_themes/llvm-theme/static/logo.png?p2=llvm/trunk/docs/_themes/llvm-theme/static/logo.png&p1=llvm/trunk/docs/llvm-theme/static/logo.png&r1=163234&r2=163235&rev=163235&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/docs/_themes/llvm-theme/static/navigation.png (from r163234, llvm/trunk/docs/llvm-theme/static/navigation.png)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/_themes/llvm-theme/static/navigation.png?p2=llvm/trunk/docs/_themes/llvm-theme/static/navigation.png&p1=llvm/trunk/docs/llvm-theme/static/navigation.png&r1=163234&r2=163235&rev=163235&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/docs/_themes/llvm-theme/theme.conf (from r163234, llvm/trunk/docs/llvm-theme/theme.conf)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/_themes/llvm-theme/theme.conf?p2=llvm/trunk/docs/_themes/llvm-theme/theme.conf&p1=llvm/trunk/docs/llvm-theme/theme.conf&r1=163234&r2=163235&rev=163235&view=diff
==============================================================================
(empty)
Modified: llvm/trunk/docs/conf.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/conf.py?rev=163235&r1=163234&r2=163235&view=diff
==============================================================================
--- llvm/trunk/docs/conf.py (original)
+++ llvm/trunk/docs/conf.py Wed Sep 5 14:44:47 2012
@@ -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)
Removed: llvm/trunk/docs/llvm-theme/layout.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm-theme/layout.html?rev=163234&view=auto
==============================================================================
--- llvm/trunk/docs/llvm-theme/layout.html (original)
+++ llvm/trunk/docs/llvm-theme/layout.html (removed)
@@ -1,23 +0,0 @@
-{#
- sphinxdoc/layout.html
- ~~~~~~~~~~~~~~~~~~~~~
-
- Sphinx layout template for the sphinxdoc theme.
-
- :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-#}
-{% extends "basic/layout.html" %}
-
-{% block relbar1 %}
-<div class="logo">
- <a href="{{ pathto('index') }}">
- <img src="{{pathto("_static/logo.png", 1) }}"
- alt="LLVM Logo" width="250" height="88"/></a>
-</div>
-{{ super() }}
-{% endblock %}
-
-{# put the sidebar before the body #}
-{% block sidebar1 %}{{ sidebar() }}{% endblock %}
-{% block sidebar2 %}{% endblock %}
Removed: llvm/trunk/docs/llvm-theme/static/contents.png
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm-theme/static/contents.png?rev=163234&view=auto
==============================================================================
Binary files llvm/trunk/docs/llvm-theme/static/contents.png (original) and llvm/trunk/docs/llvm-theme/static/contents.png (removed) differ
Removed: llvm/trunk/docs/llvm-theme/static/llvm-theme.css
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm-theme/static/llvm-theme.css?rev=163234&view=auto
==============================================================================
--- llvm/trunk/docs/llvm-theme/static/llvm-theme.css (original)
+++ llvm/trunk/docs/llvm-theme/static/llvm-theme.css (removed)
@@ -1,374 +0,0 @@
-/*
- * sphinxdoc.css_t
- * ~~~~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- sphinxdoc theme. Originally created by
- * Armin Ronacher for Werkzeug.
- *
- * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
- at import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
- 'Verdana', sans-serif;
- font-size: 14px;
- letter-spacing: -0.01em;
- line-height: 150%;
- text-align: center;
- background-color: #BFD1D4;
- color: black;
- padding: 0;
- border: 1px solid #aaa;
-
- margin: 0px 80px 0px 80px;
- min-width: 740px;
-}
-
-div.logo {
- background-color: white;
- text-align: left;
- padding: 10px 10px 15px 15px;
-}
-
-div.document {
- background-color: white;
- text-align: left;
- background-image: url(contents.png);
- background-repeat: repeat-x;
-}
-
-div.bodywrapper {
- margin: 0 240px 0 0;
- border-right: 1px solid #ccc;
-}
-
-div.body {
- margin: 0;
- padding: 0.5em 20px 20px 20px;
-}
-
-div.related {
- font-size: 1em;
-}
-
-div.related ul {
- background-image: url(navigation.png);
- height: 2em;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
-}
-
-div.related ul li {
- margin: 0;
- padding: 0;
- height: 2em;
- float: left;
-}
-
-div.related ul li.right {
- float: right;
- margin-right: 5px;
-}
-
-div.related ul li a {
- margin: 0;
- padding: 0 5px 0 5px;
- line-height: 1.75em;
- color: #EE9816;
-}
-
-div.related ul li a:hover {
- color: #3CA8E7;
-}
-
-div.sphinxsidebarwrapper {
- padding: 0;
-}
-
-div.sphinxsidebar {
- margin: 0;
- padding: 0.5em 15px 15px 0;
- width: 210px;
- float: right;
- font-size: 1em;
- text-align: left;
-}
-
-div.sphinxsidebar h3, div.sphinxsidebar h4 {
- margin: 1em 0 0.5em 0;
- font-size: 1em;
- padding: 0.1em 0 0.1em 0.5em;
- color: white;
- border: 1px solid #86989B;
- background-color: #AFC1C4;
-}
-
-div.sphinxsidebar h3 a {
- color: white;
-}
-
-div.sphinxsidebar ul {
- padding-left: 1.5em;
- margin-top: 7px;
- padding: 0;
- line-height: 130%;
-}
-
-div.sphinxsidebar ul ul {
- margin-left: 20px;
-}
-
-div.footer {
- background-color: #E3EFF1;
- color: #86989B;
- padding: 3px 8px 3px 0;
- clear: both;
- font-size: 0.8em;
- text-align: right;
-}
-
-div.footer a {
- color: #86989B;
- text-decoration: underline;
-}
-
-/* -- body styles ----------------------------------------------------------- */
-
-p {
- margin: 0.8em 0 0.5em 0;
-}
-
-a {
- color: #CA7900;
- text-decoration: none;
-}
-
-a:hover {
- color: #2491CF;
-}
-
-div.body p a{
- text-decoration: underline;
-}
-
-h1 {
- margin: 0;
- padding: 0.7em 0 0.3em 0;
- font-size: 1.5em;
- color: #11557C;
-}
-
-h2 {
- margin: 1.3em 0 0.2em 0;
- font-size: 1.35em;
- padding: 0;
-}
-
-h3 {
- margin: 1em 0 -0.3em 0;
- font-size: 1.2em;
-}
-
-h3 a:hover {
- text-decoration: underline;
-}
-
-div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a {
- color: black!important;
-}
-
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
- background-color: #f2f2f2;
- font-weight: normal;
- color: #20435c;
- border-bottom: 1px solid #ccc;
- margin: 20px -20px 10px -20px;
- padding: 3px 0 3px 10px;
-}
-
-div.body h1 { margin-top: 0; font-size: 200%; }
-div.body h2 { font-size: 160%; }
-div.body h3 { font-size: 140%; }
-div.body h4 { font-size: 120%; }
-div.body h5 { font-size: 110%; }
-div.body h6 { font-size: 100%; }
-
-h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
- display: none;
- margin: 0 0 0 0.3em;
- padding: 0 0.2em 0 0.2em;
- color: #aaa!important;
-}
-
-h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
-h5:hover a.anchor, h6:hover a.anchor {
- display: inline;
-}
-
-h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
-h5 a.anchor:hover, h6 a.anchor:hover {
- color: #777;
- background-color: #eee;
-}
-
-a.headerlink {
- color: #c60f0f!important;
- font-size: 1em;
- margin-left: 6px;
- padding: 0 4px 0 4px;
- text-decoration: none!important;
-}
-
-a.headerlink:hover {
- background-color: #ccc;
- color: white!important;
-}
-
-cite, code, tt {
- font-family: 'Consolas', 'Deja Vu Sans Mono',
- 'Bitstream Vera Sans Mono', monospace;
- font-size: 0.95em;
- letter-spacing: 0.01em;
-}
-
-:not(a.reference) > tt {
- background-color: #f2f2f2;
- border-bottom: 1px solid #ddd;
- color: #333;
-}
-
-tt.descname, tt.descclassname, tt.xref {
- border: 0;
-}
-
-hr {
- border: 1px solid #abc;
- margin: 2em;
-}
-
-p a tt {
- border: 0;
- color: #CA7900;
-}
-
-p a tt:hover {
- color: #2491CF;
-}
-
-a tt {
- border: none;
-}
-
-pre {
- font-family: 'Consolas', 'Deja Vu Sans Mono',
- 'Bitstream Vera Sans Mono', monospace;
- font-size: 0.95em;
- letter-spacing: 0.015em;
- line-height: 120%;
- padding: 0.5em;
- border: 1px solid #ccc;
- background-color: #f8f8f8;
-}
-
-pre a {
- color: inherit;
- text-decoration: underline;
-}
-
-td.linenos pre {
- padding: 0.5em 0;
-}
-
-div.quotebar {
- background-color: #f8f8f8;
- max-width: 250px;
- float: right;
- padding: 2px 7px;
- border: 1px solid #ccc;
-}
-
-div.topic {
- background-color: #f8f8f8;
-}
-
-table {
- border-collapse: collapse;
- margin: 0 -0.5em 0 -0.5em;
-}
-
-table td, table th {
- padding: 0.2em 0.5em 0.2em 0.5em;
-}
-
-div.admonition, div.warning {
- font-size: 0.9em;
- margin: 1em 0 1em 0;
- border: 1px solid #86989B;
- background-color: #f7f7f7;
- padding: 0;
-}
-
-div.admonition p, div.warning p {
- margin: 0.5em 1em 0.5em 1em;
- padding: 0;
-}
-
-div.admonition pre, div.warning pre {
- margin: 0.4em 1em 0.4em 1em;
-}
-
-div.admonition p.admonition-title,
-div.warning p.admonition-title {
- margin: 0;
- padding: 0.1em 0 0.1em 0.5em;
- color: white;
- border-bottom: 1px solid #86989B;
- font-weight: bold;
- background-color: #AFC1C4;
-}
-
-div.warning {
- border: 1px solid #940000;
-}
-
-div.warning p.admonition-title {
- background-color: #CF0000;
- border-bottom-color: #940000;
-}
-
-div.admonition ul, div.admonition ol,
-div.warning ul, div.warning ol {
- margin: 0.1em 0.5em 0.5em 3em;
- padding: 0;
-}
-
-div.versioninfo {
- margin: 1em 0 0 0;
- border: 1px solid #ccc;
- background-color: #DDEAF0;
- padding: 8px;
- line-height: 1.3em;
- font-size: 0.9em;
-}
-
-.viewcode-back {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
- 'Verdana', sans-serif;
-}
-
-div.viewcode-block:target {
- background-color: #f4debf;
- border-top: 1px solid #ac9;
- border-bottom: 1px solid #ac9;
-}
Removed: llvm/trunk/docs/llvm-theme/static/logo.png
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm-theme/static/logo.png?rev=163234&view=auto
==============================================================================
Binary files llvm/trunk/docs/llvm-theme/static/logo.png (original) and llvm/trunk/docs/llvm-theme/static/logo.png (removed) differ
Removed: llvm/trunk/docs/llvm-theme/static/navigation.png
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm-theme/static/navigation.png?rev=163234&view=auto
==============================================================================
Binary files llvm/trunk/docs/llvm-theme/static/navigation.png (original) and llvm/trunk/docs/llvm-theme/static/navigation.png (removed) differ
Removed: llvm/trunk/docs/llvm-theme/theme.conf
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm-theme/theme.conf?rev=163234&view=auto
==============================================================================
--- llvm/trunk/docs/llvm-theme/theme.conf (original)
+++ llvm/trunk/docs/llvm-theme/theme.conf (removed)
@@ -1,4 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = llvm-theme.css
-pygments_style = friendly
More information about the llvm-commits
mailing list