From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 10 Jun 2014 17:07:45 +0000 (-0500)
Subject: Issue #21688: Give informative error message when hhc.exe cannot be found.
X-Git-Tag: v3.4.2rc1~408
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59895111836a9aa36ccd519c8f44faa5abf87b8e;p=thirdparty%2FPython%2Fcpython.git

Issue #21688: Give informative error message when hhc.exe cannot be found.

Initial patch by Olive Kilburn.
---

diff --git a/Doc/make.bat b/Doc/make.bat
index 6f74cb04af7f..b26826ef145e 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