From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 70DDC385189D; Mon, 14 Nov 2022 08:38:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70DDC385189D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668415100; bh=vaTwDaiGWQth7vdL2JQFWs8xoLAJ84tDG36M9qdvzIc=; h=From:To:Subject:Date:From; b=W4HG1JqV3CELmNlFKuv6OwXxFHp+/Q2d16M2P/vAfEugPbta0D6AXoWBLuXrhhL60 u9BpqGDWrHliIe+1/R8bEpLzHs0ZK6CZzW85MewhOlIZVOdlAKhzyi4W1Ot5GZ0nQu rp9Sy9zMVp05lPRHG00leDJj++hVYqYJsZ3QKCww= 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-3981] Revert "sphinx: simplify default in baseconf.py." X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 8c7311c198ea1a3104e75b84067b214b91b79906 X-Git-Newrev: 705dd990de14128381962f8a9baf5b79be2b7d03 Message-Id: <20221114083820.70DDC385189D@sourceware.org> Date: Mon, 14 Nov 2022 08:38:17 +0000 (GMT) List-Id: https://gcc.gnu.org/g:705dd990de14128381962f8a9baf5b79be2b7d03 commit r13-3981-g705dd990de14128381962f8a9baf5b79be2b7d03 Author: Martin Liska Date: Sun Nov 13 21:58:06 2022 +0100 Revert "sphinx: simplify default in baseconf.py." This reverts commit 8d7a55b7f4ce37ecc869bd31cadc3f9e059e2f44. Diff: --- doc/baseconf.py | 13 +++++++------ maintainer-scripts/update_web_docs_git.py | 9 +++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/baseconf.py b/doc/baseconf.py index 47e3a126416..f80fdabc8b0 100644 --- a/doc/baseconf.py +++ b/doc/baseconf.py @@ -71,11 +71,13 @@ needs_sphinx = '5.3' rst_epilog = ''' .. |gcc_version| replace:: %s .. |needs_sphinx| replace:: %s\n -.. |bugurl| replace:: %s\n -.. |package_version| replace:: %s\n -''' % (gcc_BASEVER, needs_sphinx, - BUGURL if BUGURL else 'https://gcc.gnu.org/bugs/', - VERSION_PACKAGE if VERSION_PACKAGE else '(GCC)') +''' % (gcc_BASEVER, needs_sphinx) + +if BUGURL: + rst_epilog += '.. |bugurl| replace:: %s\n' % BUGURL + +if VERSION_PACKAGE: + rst_epilog += '.. |package_version| replace:: %s\n' % VERSION_PACKAGE # -- General configuration --------------------------------------------------- @@ -204,7 +206,6 @@ extlinks = { extlinks_detect_hardcoded_links = True - # Set common settings where we need NAME of the documentation def set_common(name, module): module['tags'].add(name) diff --git a/maintainer-scripts/update_web_docs_git.py b/maintainer-scripts/update_web_docs_git.py index 18c8bbb8324..f3f59953ac0 100755 --- a/maintainer-scripts/update_web_docs_git.py +++ b/maintainer-scripts/update_web_docs_git.py @@ -10,6 +10,7 @@ import tempfile from pathlib import Path GITROOT = '/git/gcc.git' +BUGURL = 'https://gcc.gnu.org/bugs/' parser = argparse.ArgumentParser(description='Update web documentation.') parser.add_argument('output_folder', help='Output folder') @@ -52,6 +53,10 @@ with tempfile.TemporaryDirectory() as folder: temp = Path('tmp').resolve() temp.mkdir() + # Prepare default env. variables + childenv = os.environ.copy() + childenv['BUGURL'] = BUGURL + # Build and copy the documentation for i, (config_folder, docname) in enumerate(sorted(configs)): print(f'=== building {i + 1}/{len(configs)}: {docname} ===') @@ -60,7 +65,7 @@ with tempfile.TemporaryDirectory() as folder: cmd = f'make -C doc html SOURCEDIR={config_folder} BUILDDIR={temp}/{docname}' if args.sphinx_build: cmd += f' SPHINXBUILD={args.sphinx_build}' - subprocess.run(cmd, shell=True, check=True, + subprocess.run(cmd, shell=True, env=childenv, check=True, capture_output=not args.verbose) os.unlink(f'{temp}/{docname}/html/.buildinfo') shutil.copytree(f'{temp}/{docname}/html', f'{output}/{docname}', @@ -70,7 +75,7 @@ with tempfile.TemporaryDirectory() as folder: cmd = f'make -C doc latexpdf SOURCEDIR={config_folder} BUILDDIR={temp}/pdf/{docname}' if args.sphinx_build: cmd += f' SPHINXBUILD={args.sphinx_build}' - subprocess.run(cmd, shell=True, check=True, + subprocess.run(cmd, shell=True, env=childenv, check=True, capture_output=not args.verbose) shutil.copyfile(f'{temp}/pdf/{docname}/latex/{docname}.pdf', f'{output}/{docname}.pdf')