From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 3 Dec 2016 20:11:25 +0000 (-0800)
Subject: Issue #28846: Various installer fixes
X-Git-Tag: v3.7.0a1~1852
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cc113a8f7e80640f445c22fba3f9a448cc37af4;p=thirdparty%2FPython%2Fcpython.git

Issue #28846: Various installer fixes
---

9cc113a8f7e80640f445c22fba3f9a448cc37af4
diff --cc Tools/msi/buildrelease.bat
index f203bada4994,4659a32b838c..d144c2ce35c8
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@@ -78,12 -81,9 +81,9 @@@ call "%D%..\..\doc\make.bat" htmlhel
  if errorlevel 1 goto :eof
  :skipdoc
  
- where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"
- if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1
- 
  where dlltool /q && goto skipdlltoolsearch
  set _DLLTOOL_PATH=
 -where /R "%EXTERNALS%\" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc" 
 +where /R "%EXTERNALS%\" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc"
  if not exist "%_DLLTOOL_PATH%" echo Cannot find binutils on PATH or in external && exit /B 1
  for %%f in (%_DLLTOOL_PATH%) do set PATH=%PATH%;%%~dpf
  set _DLLTOOL_PATH=