Issue #29080: Removes hard dependency on hg.exe from PC/build.bat

diff --git a/Misc/NEWS b/Misc/NEWS
index 11ec5f5811ec094935ac01fc76c77d62a2bf7957..47db9aaced314e8cc657ada08b89f2d009db4982 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 98fa2671f63d8da49746720024702822e5a8ad14..9e63a84bde457088ceb134b5102e183157fa402b 100644 (file)
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -106,7 +106,8 @@ if "%platf%"=="x64" (
 )\r
 \r
 if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"\r
-if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1\r
+if exist "%HG%" set HGProperty=/p:HG="%HG%"\r
+if not exist "%HG%" echo Cannot find Mercurial on PATH & set HGProperty=\r
 \r
 rem Setup the environment\r
 call "%dir%env.bat" %vs_platf% >nul\r
@@ -144,8 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
  /p:Configuration=%conf% /p:Platform=%platf%^\r
  /p:IncludeExternals=%IncludeExternals%^\r
  /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^\r
- /p:UseTestMarker=%UseTestMarker%^\r
- /p:HG="%HG%"^\r
+ /p:UseTestMarker=%UseTestMarker% %HGProperty%^\r
  %1 %2 %3 %4 %5 %6 %7 %8 %9\r
 \r
 @echo off\r