[Python-checkins] cpython (3.4): Issue #21289: Fix documentation building on Windows using Doc/make.bat.
zach.ware
python-checkins at python.org
Fri Apr 18 22:45:47 CEST 2014
http://hg.python.org/cpython/rev/02fec733f760
changeset: 90405:02fec733f760
branch: 3.4
parent: 90401:64782d0d16fe
user: Zachary Ware <zachary.ware at gmail.com>
date: Fri Apr 18 15:10:40 2014 -0500
summary:
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.
files:
Doc/README.txt | 2 +-
Doc/make.bat | 6 +++---
Misc/ACKS | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Doc/README.txt b/Doc/README.txt
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -81,7 +81,7 @@
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
--- 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 @@
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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1152,6 +1152,7 @@
Ty Sarna
Hugh Sasse
Bob Savage
+Dave Sawyer
Ben Sayer
sbt
Marco Scataglini
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list