[Python-checkins] cpython (3.5): Issue #29080: Removes hard dependency on hg.exe from PC/build.bat

Wed Dec 28 17:39:19 EST 2016

https://hg.python.org/cpython/rev/bc71c144e6f0
changeset: 105875:bc71c144e6f0
branch: 3.5
parent: 105871:b446a4aab9cf
user: Steve Dower <steve.dower at microsoft.com>
date: Wed Dec 28 14:37:44 2016 -0800
summary:
 Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
files:
 Misc/NEWS | 2 ++
 PCbuild/build.bat | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -616,6 +616,8 @@
 Build
 -----
 
+- Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
+
 - Issue #23903: Added missed names to PC/python3.def.
 
 - Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -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
-- 
Repository URL: https://hg.python.org/cpython
