public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-3971] Revert "doc: Modernize baseconf.py."
@ 2022-11-14  8:37 Martin Liska
  0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2022-11-14  8:37 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:574767073b2fd0c96b93e3cb5e3d93e79555bb62

commit r13-3971-g574767073b2fd0c96b93e3cb5e3d93e79555bb62
Author: Martin Liska <mliska@suse.cz>
Date:   Sun Nov 13 21:56:06 2022 +0100

    Revert "doc: Modernize baseconf.py."
    
    This reverts commit dd31c6923fbe8352f7efa830c47c6d0ab31cfce8.

Diff:
---
 doc/baseconf.py | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/doc/baseconf.py b/doc/baseconf.py
index 8021a101e77..d85659e4540 100644
--- a/doc/baseconf.py
+++ b/doc/baseconf.py
@@ -11,31 +11,29 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-import sys
 import time
-from pathlib import Path
-
-# Build paths and add path to gcc_sphinx.py extension.
-folder = Path(__file__).resolve().parent
-doc_modules = folder / 'modules'
-gcc_srcdir = folder / '..' / 'gcc'
-
-sys.path.insert(0, str(doc_modules))
+import sys
 
-# gccint needs a deeper stack limit.
+# gccint needs a deeper stack limit
 sys.setrecursionlimit(2000)
 
 # -- Project information -----------------------------------------------------
 
+# The full version, including alpha/beta/rc tags
+
+folder = os.path.dirname(os.path.realpath(__file__))
+doc_modules = os.path.join(folder, 'modules')
+gcc_srcdir = os.path.join(folder, '..', 'gcc')
+
+sys.path.insert(0, doc_modules)
 
 def read_file(name):
-    path = gcc_srcdir / name
-    if path.exists():
+    path = os.path.join(gcc_srcdir, name)
+    if os.path.exists(path):
         return open(path).read().strip()
     else:
         return ''
 
-
 def __get_builder_name():
     if '-b' in sys.argv:
         return sys.argv[sys.argv.index('-b') + 1]
@@ -126,14 +124,14 @@ html_theme_options = {
     'navigation_with_keys': True,
 }
 
-html_logo = str(folder / 'logo.svg')
+html_logo = os.path.join(folder, 'logo.svg')
 
-html_favicon = str(folder / 'favicon.ico')
+html_favicon = os.path.join(folder, 'favicon.ico')
 
 html_last_updated_fmt = ''
 
 html_static_path = [
-    str(folder / '_static')
+    os.path.join(folder, '_static')
 ]
 
 html_css_files = [
@@ -151,7 +149,7 @@ suppress_warnings = [
 # Use xelatex by default
 latex_engine = 'xelatex'
 
-latex_logo = str(folder / 'logo.pdf')
+latex_logo = os.path.join(folder, 'logo.pdf')
 
 latex_elements = {
     'pointsize': '11pt',
@@ -217,4 +215,4 @@ def set_common(name, module):
         module['tags'].add('development')
 
     html_theme_options['source_edit_link'] = f'https://gcc.gnu.org/onlinedocs/{name}' \
-                                             '/_sources/{filename}.txt'
+                                               '/_sources/{filename}.txt'

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-11-14  8:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-14  8:37 [gcc r13-3971] Revert "doc: Modernize baseconf.py." Martin Liska

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).