diff options
author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:24:02 (GMT) |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:24:02 (GMT) |
commit | 1058109b3182522eaa4357ef99ad22b587d36c73 (patch) | |
tree | 4bdabaa918a109e4c4cc942008d7cc34f7f08d60 /PCbuild | |
parent | b6a6b45458490c6928e4f915d7bc83b4a7b44799 (diff) | |
parent | 190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b (diff) | |
download | cpython-1058109b3182522eaa4357ef99ad22b587d36c73.zip cpython-1058109b3182522eaa4357ef99ad22b587d36c73.tar.gz cpython-1058109b3182522eaa4357ef99ad22b587d36c73.tar.bz2 |
Issue #28846: Various installer fixes
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/build.bat | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index ffcc197..1ad58f8 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -105,6 +105,9 @@ 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
+
rem Setup the environment
call "%dir%env.bat" %vs_platf% >nul
@@ -142,6 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^ /p:IncludeExternals=%IncludeExternals%^
/p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
/p:UseTestMarker=%UseTestMarker%^
+ /p:HG="%HG%"^
%1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
|