mirror of
https://github.com/python/cpython.git
synced 2025-12-23 09:19:18 +00:00
bpo-31340: Change to building with MSVC v141 (included with Visual Studio 2017) (#3311)
This commit is contained in:
parent
bcaac8188b
commit
5fcd5e64ee
10 changed files with 86 additions and 13 deletions
24
Doc/make.bat
24
Doc/make.bat
|
|
@ -16,8 +16,19 @@ if not defined SPHINXBUILD if defined PYTHON (
|
|||
set SPHINXBUILD=%PYTHON% -c "import sphinx, sys; sys.argv[0] = 'sphinx-build'; sphinx.main()"
|
||||
)
|
||||
|
||||
if not defined BLURB if defined PYTHON (
|
||||
%PYTHON% -c "import blurb" > nul 2> nul
|
||||
if errorlevel 1 (
|
||||
echo Installing blurb with %PYTHON%
|
||||
%PYTHON% -m pip install blurb
|
||||
if errorlevel 1 exit /B
|
||||
)
|
||||
set BLURB=%PYTHON% -m blurb
|
||||
)
|
||||
|
||||
if not defined PYTHON set PYTHON=py
|
||||
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
|
||||
|
|
@ -96,6 +107,19 @@ echo.be passed by setting the SPHINXOPTS environment variable.
|
|||
goto end
|
||||
|
||||
:build
|
||||
if exist ..\Misc\NEWS (
|
||||
echo.Copying Misc\NEWS to build\NEWS
|
||||
copy ..\Misc\NEWS build\NEWS > nul
|
||||
) else if exist ..\Misc\NEWS.D (
|
||||
if defined BLURB (
|
||||
echo.Merging Misc/NEWS with %BLURB%
|
||||
%BLURB% merge -f build\NEWS
|
||||
) else (
|
||||
echo.No Misc/NEWS file and Blurb is not available.
|
||||
exit /B 1
|
||||
)
|
||||
)
|
||||
|
||||
if NOT "%PAPER%" == "" (
|
||||
set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue