summaryrefslogtreecommitdiff
path: root/PCbuild
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-12-28 14:38:54 -0800
committerSteve Dower <steve.dower@microsoft.com>2016-12-28 14:38:54 -0800
commita558be76c2e29c97786e7fefa8ecc616b5b4750c (patch)
treeaaf1ebdc8014fdf98a65176a1867ad9145082c16 /PCbuild
parentd36432f7551f891bc2bed45b24928c51315dfd5c (diff)
parent654da960a0d16ed85e7f7412bedfd17cab5ade01 (diff)
downloadcpython-git-a558be76c2e29c97786e7fefa8ecc616b5b4750c.tar.gz
Issue #29080: Removes hard dependency on hg.exe from PC/build.bat
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build.bat6
1 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 1ad58f8b28..70ab340905 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