From: Zachary Ware Date: Fri, 18 Apr 2014 20:10:40 +0000 (-0500) Subject: Issue #21289: Fix documentation building on Windows using Doc/make.bat. X-Git-Tag: v3.4.1rc1~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a37ff0fb80d59946c74af874c8dcc6d629541852;p=python 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. --- 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 . build/ 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 diff --git a/Misc/ACKS b/Misc/ACKS index 14eabd4280..40f7cbefb2 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1152,6 +1152,7 @@ Mark Sapiro Ty Sarna Hugh Sasse Bob Savage +Dave Sawyer Ben Sayer sbt Marco Scataglini