From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id B0FEC385828E; Thu, 10 Nov 2022 05:39:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B0FEC385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668058791; bh=UnF+DrGLDpnNwuExzXzFkLUX1psOodiK8NO7PsBvWPE=; h=From:To:Subject:Date:From; b=G1Z6tGqntTmQT09FGwLb1qHE5mMDUwr8Ajk2WF+weYRQ97OBpSJcOg4C90Q83U4FY BJbn2EYdgTvb48yKIu0LQRlhEYULn3WTgar+/kVQ2LlT1eL+XRgzmVqs1oDq+HtxAl F2XwON62h8jvZ90WVHW+SmL/LVCkLiO3n4gKHcxA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3872] doc: Modernize baseconf.py. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 70f1c41061b2b55ed4cdc2e83c7cf326c7ebe7a4 X-Git-Newrev: dd31c6923fbe8352f7efa830c47c6d0ab31cfce8 Message-Id: <20221110053951.B0FEC385828E@sourceware.org> Date: Thu, 10 Nov 2022 05:39:51 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dd31c6923fbe8352f7efa830c47c6d0ab31cfce8 commit r13-3872-gdd31c6923fbe8352f7efa830c47c6d0ab31cfce8 Author: Martin Liska Date: Wed Nov 9 21:16:49 2022 +0100 doc: Modernize baseconf.py. ChangeLog: * doc/baseconf.py: Modernize by using pathlib. Diff: --- doc/baseconf.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/doc/baseconf.py b/doc/baseconf.py index d85659e4540..8021a101e77 100644 --- a/doc/baseconf.py +++ b/doc/baseconf.py @@ -11,29 +11,31 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. # import os -import time import sys +import time +from pathlib import Path -# gccint needs a deeper stack limit -sys.setrecursionlimit(2000) +# Build paths and add path to gcc_sphinx.py extension. +folder = Path(__file__).resolve().parent +doc_modules = folder / 'modules' +gcc_srcdir = folder / '..' / 'gcc' -# -- Project information ----------------------------------------------------- +sys.path.insert(0, str(doc_modules)) -# The full version, including alpha/beta/rc tags +# gccint needs a deeper stack limit. +sys.setrecursionlimit(2000) -folder = os.path.dirname(os.path.realpath(__file__)) -doc_modules = os.path.join(folder, 'modules') -gcc_srcdir = os.path.join(folder, '..', 'gcc') +# -- Project information ----------------------------------------------------- -sys.path.insert(0, doc_modules) def read_file(name): - path = os.path.join(gcc_srcdir, name) - if os.path.exists(path): + path = gcc_srcdir / name + if path.exists(): return open(path).read().strip() else: return '' + def __get_builder_name(): if '-b' in sys.argv: return sys.argv[sys.argv.index('-b') + 1] @@ -124,14 +126,14 @@ html_theme_options = { 'navigation_with_keys': True, } -html_logo = os.path.join(folder, 'logo.svg') +html_logo = str(folder / 'logo.svg') -html_favicon = os.path.join(folder, 'favicon.ico') +html_favicon = str(folder / 'favicon.ico') html_last_updated_fmt = '' html_static_path = [ - os.path.join(folder, '_static') + str(folder / '_static') ] html_css_files = [ @@ -149,7 +151,7 @@ suppress_warnings = [ # Use xelatex by default latex_engine = 'xelatex' -latex_logo = os.path.join(folder, 'logo.pdf') +latex_logo = str(folder / 'logo.pdf') latex_elements = { 'pointsize': '11pt', @@ -215,4 +217,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'