diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-28 22:37:44 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-28 22:37:44 (GMT) |
| commit | 7ec8a18514280065d7afe20c40cdebcad7919897 (patch) | |
| tree | b5ff99ffe3c0e277c373549a6fb1c9e5bd861a5b | |
| parent | bdf9e0ea7473bcdb7f4c01f4b76db875ec8bc64e (diff) | |
| download | cpython-7ec8a18514280065d7afe20c40cdebcad7919897.zip cpython-7ec8a18514280065d7afe20c40cdebcad7919897.tar.gz cpython-7ec8a18514280065d7afe20c40cdebcad7919897.tar.bz2 | |
Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/build.bat | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -616,6 +616,8 @@ Windows 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 index 98fa267..9e63a84 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -106,7 +106,8 @@ if "%platf%"=="x64" ( )
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 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^ /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
|