changeset:   105876:f98d8c9f3cde
branch:      3.6
parent:      105873:ea87e00a3e89
parent:      105875:bc71c144e6f0
user:        Steve Dower <steve.dower@microsoft.com>
date:        Wed Dec 28 14:38:08 2016 -0800
files:       Misc/NEWS PCbuild/build.bat
description:
Issue #29080: Removes hard dependency on hg.exe from PC/build.bat


diff -r ea87e00a3e89 -r f98d8c9f3cde Misc/NEWS
--- a/Misc/NEWS	Wed Dec 28 10:22:56 2016 +0200
+++ b/Misc/NEWS	Wed Dec 28 14:38:08 2016 -0800
@@ -103,6 +103,8 @@
 Build
 -----
 
+- Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
+
 - Issue #23903: Added missed names to PC/python3.def.
 
 - Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
diff -r ea87e00a3e89 -r f98d8c9f3cde PCbuild/build.bat
--- a/PCbuild/build.bat	Wed Dec 28 10:22:56 2016 +0200
+++ b/PCbuild/build.bat	Wed Dec 28 14:38:08 2016 -0800
@@ -106,7 +106,8 @@
 )
 
 if not exist "%HG%" 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
+if exist "%HG%" set HGProperty=/p:HG="%HG%"
+if not exist "%HG%" echo Cannot find Mercurial on PATH & set HGProperty=
 
 rem Setup the environment
 call "%dir%env.bat" %vs_platf% >nul
@@ -144,8 +145,7 @@
  /p:Configuration=%conf% /p:Platform=%platf%^
  /p:IncludeExternals=%IncludeExternals%^
  /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
- /p:UseTestMarker=%UseTestMarker%^
- /p:HG="%HG%"^
+ /p:UseTestMarker=%UseTestMarker% %HGProperty%^
  %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 @echo off