diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-06-10 17:08:20 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-06-10 17:08:20 (GMT) |
| commit | 4c4cde7829211bd565e4a045d4d9bda39cf9dab7 (patch) | |
| tree | 73e9c64ce29eb61f395749abf623876e73eec89c | |
| parent | 791e5531c992323dd0605d9ccd3092876db89073 (diff) | |
| parent | 59895111836a9aa36ccd519c8f44faa5abf87b8e (diff) | |
| download | cpython-4c4cde7829211bd565e4a045d4d9bda39cf9dab7.zip cpython-4c4cde7829211bd565e4a045d4d9bda39cf9dab7.tar.gz cpython-4c4cde7829211bd565e4a045d4d9bda39cf9dab7.tar.bz2 | |
Issue #21688: Merge with 3.4
| -rw-r--r-- | Doc/make.bat | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Doc/make.bat b/Doc/make.bat index 6f74cb0..b26826e 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -76,6 +76,15 @@ if NOT "%PAPER%" == "" ( cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* if "%1" EQU "htmlhelp" ( + if not exist "%HTMLHELP%" ( + echo. + echo.The HTML Help Workshop was not found. Set the HTMLHELP variable + echo.to the path to hhc.exe or download and install it from + echo.http://msdn.microsoft.com/en-us/library/ms669985 + rem Set errorlevel to 1 and exit + cmd /C exit /b 1 + goto end + ) cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 if not errorlevel 2 cmd /C exit /b 0 |