69 lines
3.2 KiB
Diff
69 lines
3.2 KiB
Diff
diff '--color=auto' -rupN fmt.orig/doc/build.py fmt/doc/build.py
|
|
--- fmt.orig/doc/build.py 2022-11-06 10:33:24.090111201 +0100
|
|
+++ fmt/doc/build.py 2022-11-06 10:59:30.089304304 +0100
|
|
@@ -6,34 +6,6 @@ from subprocess import check_call, Calle
|
|
|
|
versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0', '6.0.0', '6.1.0', '6.1.1', '6.1.2', '6.2.0', '6.2.1', '7.0.0', '7.0.1', '7.0.2', '7.0.3', '7.1.0', '7.1.1', '7.1.2', '7.1.3', '8.0.0', '8.0.1', '8.1.0', '8.1.1', '9.0.0', '9.1.0']
|
|
|
|
-class Pip:
|
|
- def __init__(self, venv_dir):
|
|
- self.path = os.path.join(venv_dir, 'bin', 'pip')
|
|
-
|
|
- def install(self, package, commit=None):
|
|
- "Install package using pip."
|
|
- if commit:
|
|
- package = 'git+https://github.com/{0}.git@{1}'.format(package, commit)
|
|
- print('Installing {0}'.format(package))
|
|
- check_call([self.path, 'install', package])
|
|
-
|
|
-def create_build_env(venv_dir='virtualenv'):
|
|
- # Create virtualenv.
|
|
- if not os.path.exists(venv_dir):
|
|
- check_call(['python3', '-m', 'venv', venv_dir])
|
|
- # Install Sphinx and Breathe. Require the exact version of Sphinx which is
|
|
- # compatible with Breathe.
|
|
- pip = Pip(venv_dir)
|
|
- pip.install('wheel')
|
|
- pip.install('six')
|
|
- # See: https://github.com/sphinx-doc/sphinx/issues/9777
|
|
- pip.install('docutils==0.17.1')
|
|
- # Jinja2 >= 3.1 incompatible with sphinx 3.3.0
|
|
- # See: https://github.com/sphinx-doc/sphinx/issues/10291
|
|
- pip.install('Jinja2<3.1')
|
|
- pip.install('sphinx-doc/sphinx', 'v3.3.0')
|
|
- pip.install('michaeljones/breathe', 'v4.25.0')
|
|
-
|
|
def build_docs(version='dev', **kwargs):
|
|
doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__)))
|
|
work_dir = kwargs.get('work_dir', '.')
|
|
@@ -99,13 +71,14 @@ def build_docs(version='dev', **kwargs):
|
|
|
|
html_dir = os.path.join(work_dir, 'html')
|
|
main_versions = reversed(versions[-3:])
|
|
- check_call([os.path.join(work_dir, 'virtualenv', 'bin', 'sphinx-build'),
|
|
+ check_call(['sphinx-build',
|
|
'-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir),
|
|
'-Dversion=' + version, '-Drelease=' + version,
|
|
'-Aversion=' + version, '-Aversions=' + ','.join(main_versions),
|
|
'-b', 'html', doc_dir, html_dir])
|
|
try:
|
|
- check_call(['lessc', '--verbose', '--clean-css',
|
|
+ check_call(['npm', 'install', 'less', 'less-plugin-clean-css'])
|
|
+ check_call(['npx', 'lessc', '--verbose', '--clean-css',
|
|
'--include-path=' + os.path.join(doc_dir, 'bootstrap'),
|
|
os.path.join(doc_dir, 'fmt.less'),
|
|
os.path.join(html_dir, '_static', 'fmt.css')])
|
|
@@ -118,5 +91,4 @@ def build_docs(version='dev', **kwargs):
|
|
return html_dir
|
|
|
|
if __name__ == '__main__':
|
|
- create_build_env()
|
|
build_docs(sys.argv[1])
|
|
diff '--color=auto' -rupN fmt.orig/.git/FETCH_HEAD fmt/.git/FETCH_HEAD
|
|
--- fmt.orig/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100
|
|
+++ fmt/.git/FETCH_HEAD 2022-11-06 10:42:25.065548317 +0100
|
|
@@ -0,0 +1,3 @@
|
|
+fc07217d85e6dcec52878807d6bbd89a9d9156a5 branch 'master' of https://github.com/fmtlib/fmt
|
|
+3e8d2c57f3aee665e4672cd4e3fbf69cc2ebff2d not-for-merge branch '4.x' of https://github.com/fmtlib/fmt
|
|
+48f76dbb5211e9731b7f8aa19209ba86a1b8df23 not-for-merge branch 'text' of https://github.com/fmtlib/fmt
|