rtems/rtems-docs
1
0
Fork 0
mirror of https://git.rtems.org/rtems-docs/ synced 2025-10-17 13:34:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

sphinx/style: Fix building with the latest sphinx

Browse Source 
Tested on sphinx 7.2, 6.1.3 AND 5.3.0

Closes #4980
This commit is contained in:
Chris Johns
2023-12-19 12:31:52 +11:00
parent ddf2b03838
commit e31a0b22fe
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/sphinx_rtd_theme_rtems/layout.html
View File

@@ -67,7 +67,11 @@
{%- endblock %} {%- endblock %}
{# CSS #} {# CSS #}
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> {%- if sphinx_version <= "5.9.0" -%}
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
{%- else %}
<link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" />
{%- endif %}
<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
{%- for css in css_files %} {%- for css in css_files %}
{%- if css|attr("rel") %} {%- if css|attr("rel") %}

4
common/waf.py
View File

@@ -16,11 +16,9 @@ from waflib.Build import BuildContext
import latex import latex
import conf import conf
# Sphinx >= 6 are currently broken.
# If you do not want to check for a maximum version, set it to None. # If you do not want to check for a maximum version, set it to None.
sphinx_min_version = (1, 3) sphinx_min_version = (1, 3)
sphinx_max_version = (5, 9) sphinx_max_version = None
#sphinx_max_version = None
def version_cmdline(ctx): def version_cmdline(ctx):
return '-Drelease="%s" -Dversion="%s" -Drtems_major="%s" ' \ return '-Drelease="%s" -Dversion="%s" -Drtems_major="%s" ' \