mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 15:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Steve Dower 2016-12-28 14:38:54 -08:00
commit a558be76c2
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -597,6 +597,8 @@ Documentation
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 #28762: lockf() is available on Android API level 24, but the F_LOCK - Issue #28762: lockf() is available on Android API level 24, but the F_LOCK

6
PCbuild/build.bat
View file

@ -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%^
/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