Commit 7ec8a185 authored by Steve Dower's avatar Steve Dower

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

parent bdf9e0ea
...@@ -616,6 +616,8 @@ Windows ...@@ -616,6 +616,8 @@ Windows
Build Build
----- -----
- Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
- Issue #23903: Added missed names to PC/python3.def. - Issue #23903: Added missed names to PC/python3.def.
- Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and - Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and
......
...@@ -106,7 +106,8 @@ if "%platf%"=="x64" ( ...@@ -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%" 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 rem Setup the environment
call "%dir%env.bat" %vs_platf% >nul call "%dir%env.bat" %vs_platf% >nul
...@@ -144,8 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^ ...@@ -144,8 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
/p:Configuration=%conf% /p:Platform=%platf%^ /p:Configuration=%conf% /p:Platform=%platf%^
/p:IncludeExternals=%IncludeExternals%^ /p:IncludeExternals=%IncludeExternals%^
/p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^ /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
/p:UseTestMarker=%UseTestMarker%^ /p:UseTestMarker=%UseTestMarker% %HGProperty%^
/p:HG="%HG%"^
%1 %2 %3 %4 %5 %6 %7 %8 %9 %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off @echo off
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment