diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-04-18 15:10:40 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-04-18 15:10:40 -0500 |
| commit | 1429644c7d438c3e9a585750e118c48c3e930a86 (patch) | |
| tree | 2d283ebb3439d6b77614b10cb72ff115fb1e0c0f /Doc | |
| parent | ffe5ed5a00fbe33a1df8fb76a4e093cc19f65896 (diff) | |
| download | cpython-1429644c7d438c3e9a585750e118c48c3e930a86.tar.gz | |
Issue #21289: Fix documentation building on Windows using Doc/make.bat.
Also fixes a long-standing typo in Doc/README.txt.
Initial patch by Dave Sawyer.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/README.txt | 2 | ||||
| -rw-r--r-- | Doc/make.bat | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index 8e0241096b..0bc163807e 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -81,7 +81,7 @@ Without make Install the Sphinx package and its dependencies from PyPI. -Then, from the ``Docs`` directory, run :: +Then, from the ``Doc`` directory, run :: sphinx-build -b<builder> . build/<builder> diff --git a/Doc/make.bat b/Doc/make.bat index 0b5b56e428..838820fc9c 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -1,7 +1,8 @@ @@echo off setlocal -if "%PYTHON%" EQU "" set PYTHON=py -2 +if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build +if "%PYTHON%" EQU "" set PYTHON=py if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v @@ -32,8 +33,7 @@ goto end if not exist build mkdir build if not exist build\%1 mkdir build\%1 if not exist build\doctrees mkdir build\doctrees -cmd /C %PYTHON% --version -cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%* +cmd /C %SPHINXBUILD% -b%1 -dbuild\doctrees . build\%* if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp goto end |