Add patches to use static docs using Debian-provided MathJax

Signed-off-by: Nicholas D Steeves <nsteeves@gmail.com>
This commit is contained in:
Nicholas D Steeves 2018-02-10 21:07:21 -05:00 committed by Sylvestre Ledru
parent fe4f762558
commit 75ae8865bc
3 changed files with 188 additions and 0 deletions

View File

@ -0,0 +1,63 @@
From: Nicholas D Steeves <nsteeves@gmail.com>
Date: Sat, 10 Feb 2018 21:00:55 -0500
Subject: Set html_static_path = ['_static'] everywhere.
---
clang-tools-extra/docs/conf.py | 2 +-
clang/docs/analyzer/conf.py | 2 +-
clang/docs/conf.py | 2 +-
polly/docs/conf.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/clang-tools-extra/docs/conf.py b/clang-tools-extra/docs/conf.py
index e872c55..69f425a 100644
--- a/clang-tools-extra/docs/conf.py
+++ b/clang-tools-extra/docs/conf.py
@@ -121,7 +121,7 @@ html_theme = 'haiku'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = []
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/clang/docs/analyzer/conf.py b/clang/docs/analyzer/conf.py
index c40af7a..666308d 100644
--- a/clang/docs/analyzer/conf.py
+++ b/clang/docs/analyzer/conf.py
@@ -121,7 +121,7 @@ html_theme = 'haiku'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = []
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/clang/docs/conf.py b/clang/docs/conf.py
index a9861cd..d125dc6 100644
--- a/clang/docs/conf.py
+++ b/clang/docs/conf.py
@@ -121,7 +121,7 @@ html_theme = 'haiku'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = []
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/polly/docs/conf.py b/polly/docs/conf.py
index 64d3968..aa854ad 100644
--- a/polly/docs/conf.py
+++ b/polly/docs/conf.py
@@ -127,7 +127,7 @@ except ImportError:
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = []
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.

View File

@ -0,0 +1,122 @@
From: Nicholas D Steeves <nsteeves@gmail.com>
Date: Sat, 10 Feb 2018 21:02:17 -0500
Subject: Use Debian-provided MathJax everywhere.
---
clang-tools-extra/docs/Doxyfile | 2 +-
clang-tools-extra/docs/conf.py | 3 +++
clang-tools-extra/docs/doxygen.cfg.in | 2 +-
clang/docs/analyzer/conf.py | 3 +++
clang/docs/conf.py | 3 +++
clang/docs/doxygen.cfg.in | 2 +-
docs/doxygen.cfg.in | 2 +-
polly/docs/doxygen.cfg.in | 2 +-
8 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/clang-tools-extra/docs/Doxyfile b/clang-tools-extra/docs/Doxyfile
index d674390..1bf4f72 100644
--- a/clang-tools-extra/docs/Doxyfile
+++ b/clang-tools-extra/docs/Doxyfile
@@ -1206,7 +1206,7 @@ USE_MATHJAX = NO
# MathJax, but it is strongly recommended to install a local copy of MathJax
# before deployment.
-MATHJAX_RELPATH = http://www.mathjax.org/mathjax
+MATHJAX_RELPATH = /usr/share/javascript/mathjax
# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
# names that should be enabled during MathJax rendering.
diff --git a/clang-tools-extra/docs/conf.py b/clang-tools-extra/docs/conf.py
index 69f425a..46f8eea 100644
--- a/clang-tools-extra/docs/conf.py
+++ b/clang-tools-extra/docs/conf.py
@@ -123,6 +123,9 @@ html_theme = 'haiku'
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
+# Use Debian-provided MathJax
+mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
diff --git a/clang-tools-extra/docs/doxygen.cfg.in b/clang-tools-extra/docs/doxygen.cfg.in
index 6dbf6db..da44cfc 100644
--- a/clang-tools-extra/docs/doxygen.cfg.in
+++ b/clang-tools-extra/docs/doxygen.cfg.in
@@ -1438,7 +1438,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES.
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH = /usr/share/javascript/mathjax
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example
diff --git a/clang/docs/analyzer/conf.py b/clang/docs/analyzer/conf.py
index 666308d..2881bcc 100644
--- a/clang/docs/analyzer/conf.py
+++ b/clang/docs/analyzer/conf.py
@@ -123,6 +123,9 @@ html_theme = 'haiku'
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
+# Use Debian-provided MathJax
+mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
diff --git a/clang/docs/conf.py b/clang/docs/conf.py
index d125dc6..2ce1a91 100644
--- a/clang/docs/conf.py
+++ b/clang/docs/conf.py
@@ -123,6 +123,9 @@ html_theme = 'haiku'
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
+# Use Debian-provided MathJax
+mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
diff --git a/clang/docs/doxygen.cfg.in b/clang/docs/doxygen.cfg.in
index 13ed722..77bed6e 100644
--- a/clang/docs/doxygen.cfg.in
+++ b/clang/docs/doxygen.cfg.in
@@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES.
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH = /usr/share/javascript/mathjax
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example
diff --git a/docs/doxygen.cfg.in b/docs/doxygen.cfg.in
index e3c7f47..dcdade1 100644
--- a/docs/doxygen.cfg.in
+++ b/docs/doxygen.cfg.in
@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES.
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH = /usr/share/javascript/mathjax
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example
diff --git a/polly/docs/doxygen.cfg.in b/polly/docs/doxygen.cfg.in
index 36786aa..26a8984 100644
--- a/polly/docs/doxygen.cfg.in
+++ b/polly/docs/doxygen.cfg.in
@@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES.
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH = /usr/share/javascript/mathjax
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example

View File

@ -51,3 +51,6 @@ test-keep-alive.diff
libfuzzer-path.diff
silent-gold-regression.diff
glibc_2.27.diff
0048-Set-html_static_path-_static-everywhere.patch
0049-Use-Debian-provided-MathJax-everywhere.patch