diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-28 22:38:08 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-28 22:38:08 (GMT) |
| commit | 654da960a0d16ed85e7f7412bedfd17cab5ade01 (patch) | |
| tree | 9d18791329ae3994e840cbfb1d1d80c08c58d62e | |
| parent | 6c57708949fdc409b666b8e9e0ed22d2724a44d3 (diff) | |
| parent | 7ec8a18514280065d7afe20c40cdebcad7919897 (diff) | |
| download | cpython-654da960a0d16ed85e7f7412bedfd17cab5ade01.zip cpython-654da960a0d16ed85e7f7412bedfd17cab5ade01.tar.gz cpython-654da960a0d16ed85e7f7412bedfd17cab5ade01.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
@@ -103,6 +103,8 @@ Tests 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 --git a/PCbuild/build.bat b/PCbuild/build.bat index 1ad58f8..70ab340 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
|