Rename "makerst.py" to "make_rst.py"

(cherry picked from commits 8f05e26198
and cce7797a75)
This commit is contained in:
Aaron Franke 2021-10-24 01:48:03 -05:00 committed by Rémi Verschelde
parent cef504b955
commit 69e90daae3
No known key found for this signature in database
GPG key ID: C3336907360768E1
7 changed files with 12 additions and 10 deletions

View file

@ -44,4 +44,4 @@ jobs:
- name: Documentation checks - name: Documentation checks
run: | run: |
doc/tools/makerst.py --dry-run doc/classes modules doc/tools/make_rst.py --dry-run doc/classes modules

View file

@ -24,7 +24,7 @@ markdown:
rst: rst:
rm -rf $(OUTPUTDIR)/rst rm -rf $(OUTPUTDIR)/rst
mkdir -p $(OUTPUTDIR)/rst mkdir -p $(OUTPUTDIR)/rst
python3 $(TOOLSDIR)/makerst.py -o $(OUTPUTDIR)/rst $(CLASSES) python3 $(TOOLSDIR)/make_rst.py -o $(OUTPUTDIR)/rst $(CLASSES)
rstjs: rstjs:
rm -rf $(OUTPUTDIR)/rstjs rm -rf $(OUTPUTDIR)/rstjs

View file

@ -1,5 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# This script makes RST files from the XML class reference for use with the online docs.
import argparse import argparse
import os import os
import re import re
@ -399,7 +401,7 @@ def make_rst_class(class_def, state, dry_run, output_dir): # type: (ClassDef, S
# Warn contributors not to edit this file directly # Warn contributors not to edit this file directly
f.write(":github_url: hide\n\n") f.write(":github_url: hide\n\n")
f.write(".. Generated automatically by doc/tools/makerst.py in Godot's source tree.\n") f.write(".. Generated automatically by doc/tools/make_rst.py in Godot's source tree.\n")
f.write(".. DO NOT EDIT THIS FILE, but the " + class_name + ".xml source instead.\n") f.write(".. DO NOT EDIT THIS FILE, but the " + class_name + ".xml source instead.\n")
f.write(".. The source is found in doc/classes or modules/<name>/doc_classes.\n\n") f.write(".. The source is found in doc/classes or modules/<name>/doc_classes.\n\n")

View file

@ -24,7 +24,7 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\\n" "Content-Transfer-Encoding: 8-bit\\n"
""" """
# Some strings used by makerst.py are normally part of the editor translations, # Some strings used by make_rst.py are normally part of the editor translations,
# so we need to include them manually here for the online docs. # so we need to include them manually here for the online docs.
BASE_STRINGS = [ BASE_STRINGS = [
"Description", "Description",
@ -225,7 +225,7 @@ def _generate_translation_catalog_file(unique_msgs, output):
with open(output, "w", encoding="utf8") as f: with open(output, "w", encoding="utf8") as f:
f.write(HEADER) f.write(HEADER)
for msg in BASE_STRINGS: for msg in BASE_STRINGS:
f.write("#: doc/tools/makerst.py\n") f.write("#: doc/tools/make_rst.py\n")
f.write('msgid "{}"\n'.format(msg)) f.write('msgid "{}"\n'.format(msg))
f.write('msgstr ""\n\n') f.write('msgstr ""\n\n')
for msg in unique_msgs: for msg in unique_msgs:

View file

@ -12,8 +12,8 @@ contributors to make sure they comply with our requirements.
`PATH`, or if you want to enable colored output with `pygmentize`. `PATH`, or if you want to enable colored output with `pygmentize`.
- Pre-commit hook for `black`: Applies `black` to the staged Python files - Pre-commit hook for `black`: Applies `black` to the staged Python files
before accepting a commit. before accepting a commit.
- Pre-commit hook for `makerst`: Checks the class reference syntax using - Pre-commit hook for `make_rst`: Checks the class reference syntax using
`makerst.py`. `make_rst.py`.
## Installation ## Installation

View file

@ -14,7 +14,7 @@
# as this script. Hooks should return 0 if successful and nonzero to cancel the # as this script. Hooks should return 0 if successful and nonzero to cancel the
# commit. They are executed in the order in which they are listed. # commit. They are executed in the order in which they are listed.
#HOOKS="pre-commit-compile pre-commit-uncrustify" #HOOKS="pre-commit-compile pre-commit-uncrustify"
HOOKS="pre-commit-clang-format pre-commit-black pre-commit-makerst" HOOKS="pre-commit-clang-format pre-commit-black pre-commit-make-rst"
########################################################### ###########################################################
# There should be no need to change anything below this line. # There should be no need to change anything below this line.

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Git pre-commit hook that checks the class reference syntax using makerst.py. # Git pre-commit hook that checks the class reference syntax using make_rst.py.
# Workaround because we can't execute the .py file directly on windows # Workaround because we can't execute the .py file directly on windows
PYTHON=python PYTHON=python
@ -9,4 +9,4 @@ if [[ "$py_ver" != "3" ]]; then
PYTHON+=3 PYTHON+=3
fi fi
$PYTHON doc/tools/makerst.py doc/classes modules --dry-run $PYTHON doc/tools/make_rst.py doc/classes modules --dry-run