aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/doc/share/conf.py
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@adacore.com>2021-04-07 05:11:57 -0400
committerPierre-Marie de Rodat <derodat@adacore.com>2021-04-28 05:37:53 -0400
commit4c118453c7c6db1e24145401abf70d286133de3f (patch)
tree4e418194a4575fb22bde262c9aea30df9068679b /gcc/ada/doc/share/conf.py
parent5b4b66291f2086f56dc3a1d7df494f901cd0b63e (diff)
downloadgcc-4c118453c7c6db1e24145401abf70d286133de3f.zip
gcc-4c118453c7c6db1e24145401abf70d286133de3f.tar.gz
gcc-4c118453c7c6db1e24145401abf70d286133de3f.tar.bz2
[Ada] Fix the Sphinx configuration and port it to Python3
gcc/ada/ * .gitignore: New. * doc/share/conf.py: Add Python 3 compatibility. * doc/share/gnat.sty: Add missing file.
Diffstat (limited to 'gcc/ada/doc/share/conf.py')
-rw-r--r--gcc/ada/doc/share/conf.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/gcc/ada/doc/share/conf.py b/gcc/ada/doc/share/conf.py
index e6fafcf..debd716 100644
--- a/gcc/ada/doc/share/conf.py
+++ b/gcc/ada/doc/share/conf.py
@@ -37,45 +37,45 @@ def get_copyright():
def get_gnat_version():
- m = re.search(r'Gnat_Static_Version_String : ' +
- r'constant String := "([^\(\)]+)\(.*\)?";',
+ m = re.search(br'Gnat_Static_Version_String : ' +
+ br'constant String := "([^\(\)]+)\(.*\)?";',
gnatvsn_content)
if m:
- return m.group(1).strip()
+ return m.group(1).strip().decode()
else:
if texi_fsf and os.path.exists(basever):
return ''
try:
- with open(basever, 'rb') as fd:
+ with open(basever) as fd:
return fd.read()
- except:
+ except Exception:
pass
- print 'cannot find GNAT version in gnatvsn.ads or in ' + basever
+ print('cannot find GNAT version in gnatvsn.ads or in ' + basever)
sys.exit(1)
def get_gnat_build_type():
- m = re.search(r'Build_Type : constant Gnat_Build_Type := (.+);',
+ m = re.search(br'Build_Type : constant Gnat_Build_Type := (.+);',
gnatvsn_content)
if m:
- return {'Gnatpro': 'PRO',
- 'FSF': 'FSF',
- 'GPL': 'GPL'}[m.group(1).strip()]
+ return {b'Gnatpro': 'PRO',
+ b'FSF': 'FSF',
+ b'GPL': 'GPL'}[m.group(1).strip()]
else:
- print 'cannot compute GNAT build type'
+ print('cannot compute GNAT build type')
sys.exit(1)
# First retrieve the name of the documentation we are building
doc_name = os.environ.get('DOC_NAME', None)
if doc_name is None:
- print 'DOC_NAME environment variable should be set'
+ print('DOC_NAME environment variable should be set')
sys.exit(1)
if doc_name not in DOCS:
- print '%s is not a valid documentation name' % doc_name
+ print('%s is not a valid documentation name' % doc_name)
sys.exit(1)
@@ -84,11 +84,11 @@ exclude_patterns = []
for d in os.listdir(root_source_dir):
if d not in ('share', doc_name, doc_name + '.rst'):
exclude_patterns.append(d)
- print 'ignoring %s' % d
+ print('ignoring %s' % d)
if doc_name == 'gnat_rm':
exclude_patterns.append('share/gnat_project_manager.rst')
- print 'ignoring share/gnat_project_manager.rst'
+ print('ignoring share/gnat_project_manager.rst')
extensions = []
templates_path = ['_templates']
@@ -103,7 +103,7 @@ copyright = get_copyright()
version = get_gnat_version()
release = get_gnat_version()
-pygments_style = 'sphinx'
+pygments_style = None
tags.add(get_gnat_build_type())
html_theme = 'sphinxdoc'
if os.path.isfile('adacore_transparent.png'):