diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-07-17 09:15:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 09:15:48 (GMT) |
| commit | 68d663cf85d1ac5eaf83482eed39c0a6f8093601 (patch) | |
| tree | fe26ff995655c31aca2d5c0f7bc4f8048cca5cc4 /Doc | |
| parent | 49f6449ef4b81537c19b82329caaf60596c516c2 (diff) | |
| download | cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.zip cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.tar.gz cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.tar.bz2 | |
[bpo-30916] Pre-build OpenSSL and Tcl/Tk for Windows (#2688)
Updates ssl and tkinter projects to use pre-built externals
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/make.bat | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Doc/make.bat b/Doc/make.bat index d9c0ad0..b9e8a75 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -5,8 +5,19 @@ pushd %~dp0 set this=%~n0 -if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build +call ..\PCBuild\find_python.bat %PYTHON% +if "%SPHINXBUILD%" EQU "" if "%PYTHON%" NEQ "" ( + set SPHINXBUILD=%PYTHON%\..\Scripts\sphinx-build.exe + rem Cannot use %SPHINXBUILD% in the same block where we set it + if not exist "%PYTHON%\..\Scripts\sphinx-build.exe" ( + echo Installing sphinx with %PYTHON% + "%PYTHON%" -m pip install sphinx + if errorlevel 1 exit /B + ) +) + if "%PYTHON%" EQU "" set PYTHON=py +if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build if "%1" NEQ "htmlhelp" goto :skiphhcsearch if exist "%HTMLHELP%" goto :skiphhcsearch |