[Python-checkins] bpo-33696: Install python-docs-theme even if SPHINXBUILD is defined (GH-7242)

Wed May 30 13:32:44 EDT 2018

https://github.com/python/cpython/commit/ea1982a475a619500c93bc3d60c6cb63a202b7ed
commit: ea1982a475a619500c93bc3d60c6cb63a202b7ed
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年05月30日T10:32:33-07:00
summary:
bpo-33696: Install python-docs-theme even if SPHINXBUILD is defined (GH-7242)
(cherry picked from commit 05f1c8902c78dce66aed067444e2b973221bae2b)
Co-authored-by: Andrés Delfino <adelfino at gmail.com>
files:
M Doc/make.bat

diff --git a/Doc/make.bat b/Doc/make.bat
index 7ca84979a300..0808e0cd09f5 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -16,15 +16,16 @@ if not defined SPHINXBUILD (
 %PYTHON% -m pip install sphinx
 if errorlevel 1 exit /B
 )
- %PYTHON% -c "import python_docs_theme" > nul 2> nul
- if errorlevel 1 (
- echo Installing python-docs-theme with %PYTHON%
- %PYTHON% -m pip install python-docs-theme
- if errorlevel 1 exit /B
- )
 set SPHINXBUILD=%PYTHON% -c "import sphinx, sys; sys.argv[0] = 'sphinx-build'; sys.exit(sphinx.main())"
 )
 
+%PYTHON% -c "import python_docs_theme" > nul 2> nul
+if errorlevel 1 (
+ echo Installing python-docs-theme with %PYTHON%
+ %PYTHON% -m pip install python-docs-theme
+ if errorlevel 1 exit /B
+)
+
 if not defined BLURB (
 %PYTHON% -c "import blurb" > nul 2> nul
 if errorlevel 1 (
@@ -35,9 +36,6 @@ if not defined BLURB (
 set BLURB=%PYTHON% -m blurb
 )
 
-if not defined SPHINXBUILD set SPHINXBUILD=sphinx-build
-if not defined BLURB set BLURB=blurb
-
 if "%1" NEQ "htmlhelp" goto :skiphhcsearch
 if exist "%HTMLHELP%" goto :skiphhcsearch
 
