parent
3cae3a5825
commit
a2bff58183
@ -1,22 +0,0 @@
|
|||||||
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
||||||
index 9b2063b8..589deacc 100644
|
|
||||||
--- a/doc/CMakeLists.txt
|
|
||||||
+++ b/doc/CMakeLists.txt
|
|
||||||
@@ -4,11 +4,13 @@ if (NOT DOXYGEN)
|
|
||||||
return ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
+find_package(PythonInterp
|
|
||||||
+ QUIET REQUIRED)
|
|
||||||
find_program(SPHINX_EXECUTABLE
|
|
||||||
NAMES sphinx-build sphinx-build-3)
|
|
||||||
add_custom_target(doc
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE}
|
|
||||||
- ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
|
|
||||||
+ ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
|
|
||||||
SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html)
|
|
||||||
|
|
||||||
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,34 +1,48 @@
|
|||||||
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
||||||
index 108aa71e..9b2063b8 100644
|
index 06848450..8e5e8a83 100644
|
||||||
--- a/doc/CMakeLists.txt
|
--- a/doc/CMakeLists.txt
|
||||||
+++ b/doc/CMakeLists.txt
|
+++ b/doc/CMakeLists.txt
|
||||||
@@ -4,8 +4,11 @@ if (NOT DOXYGEN)
|
@@ -5,10 +5,11 @@ if (NOT DOXYGEN)
|
||||||
return ()
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
+find_program(SPHINX_EXECUTABLE
|
find_package(PythonInterp QUIET REQUIRED)
|
||||||
+ NAMES sphinx-build sphinx-build-3)
|
+find_program(SPHINX_EXECUTABLE NAMES sphinx-build sphinx-build-3)
|
||||||
|
|
||||||
add_custom_target(doc
|
add_custom_target(doc
|
||||||
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
|
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build.py
|
||||||
+ COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE}
|
- ${FMT_VERSION}
|
||||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
|
+ ${SPHINX_EXECUTABLE} ${FMT_VERSION}
|
||||||
SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html)
|
SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html)
|
||||||
|
|
||||||
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
|
include(GNUInstallDirs)
|
||||||
diff --git a/doc/build.py b/doc/build.py
|
diff --git a/doc/build.py b/doc/build.py
|
||||||
index 8df66bda..840fdf40 100755
|
index 94ac1074..686c8b1a 100755
|
||||||
--- a/doc/build.py
|
--- a/doc/build.py
|
||||||
+++ b/doc/build.py
|
+++ b/doc/build.py
|
||||||
@@ -49,7 +49,8 @@ def build_docs(version='dev', **kwargs):
|
@@ -7,7 +7,7 @@ from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE
|
||||||
|
|
||||||
|
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']
|
||||||
|
|
||||||
|
-def build_docs(version='dev', **kwargs):
|
||||||
|
+def build_docs(sphinx_executable='sphinx-build', version='dev', **kwargs):
|
||||||
|
doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__)))
|
||||||
|
work_dir = kwargs.get('work_dir', '.')
|
||||||
|
include_dir = kwargs.get(
|
||||||
|
@@ -50,7 +50,7 @@ def build_docs(version='dev', **kwargs):
|
||||||
raise CalledProcessError(p.returncode, cmd)
|
raise CalledProcessError(p.returncode, cmd)
|
||||||
html_dir = os.path.join(work_dir, 'html')
|
html_dir = os.path.join(work_dir, 'html')
|
||||||
main_versions = reversed(versions[-3:])
|
main_versions = reversed(versions[-3:])
|
||||||
- check_call(['sphinx-build',
|
- check_call(['sphinx-build',
|
||||||
+ sphinx_build = os.environ.get('SPHINX_EXECUTABLE', 'sphinx-build')
|
+ check_call([sphinx_executable,
|
||||||
+ check_call([sphinx_build,
|
|
||||||
'-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir),
|
'-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir),
|
||||||
'-Dversion=' + version, '-Drelease=' + version,
|
'-Dversion=' + version, '-Drelease=' + version,
|
||||||
'-Aversion=' + version, '-Aversions=' + ','.join(main_versions),
|
'-Aversion=' + version, '-Aversions=' + ','.join(main_versions),
|
||||||
|
@@ -69,4 +69,4 @@ def build_docs(version='dev', **kwargs):
|
||||||
|
return html_dir
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
- build_docs(sys.argv[1])
|
||||||
|
+ build_docs(sys.argv[1], sys.argv[2])
|
||||||
--
|
--
|
||||||
2.26.2
|
2.26.2
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
SHA512 (7.0.3.tar.gz) = 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
|
SHA512 (7.1.2.tar.gz) = e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
|
||||||
|
Loading…
Reference in new issue