Fixes argument handling in build.bat and HHC search

1 files changed, 7 insertions, 10 deletions

diff --git a/Doc/make.bat b/Doc/make.bat
index 3ff91f288d..5ab80850a3 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -17,7 +17,13 @@ where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch
 where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"

 if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"

 if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"

-if not exist "%HTMLHELP%" echo Cannot find HHC on PATH or in externals & exit /B 1

+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

+    exit /B 1

+)

 :skiphhcsearch

 

 if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v

@@ -85,15 +91,6 @@ 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