diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 20:11:25 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 20:11:25 (GMT) |
| commit | 9cc113a8f7e80640f445c22fba3f9a448cc37af4 (patch) | |
| tree | e5d0d8e9f25feb29a4b8c9849dc267a30d3fb169 /PCbuild | |
| parent | 853ec5d408afc21154a08d86f3d92ac66245a159 (diff) | |
| parent | f00ef72ee1ef4f35eaa9ad8a760c11f8c21c5383 (diff) | |
| download | cpython-9cc113a8f7e80640f445c22fba3f9a448cc37af4.zip cpython-9cc113a8f7e80640f445c22fba3f9a448cc37af4.tar.gz cpython-9cc113a8f7e80640f445c22fba3f9a448cc37af4.tar.bz2 | |
Issue #28846: Various installer fixes
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build.bat | 4 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 1 |
2 files changed, 5 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
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 89415ae..6b23d8e 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -412,6 +412,7 @@ <_HG Condition="$(HG.Contains(` `))">"$(HG)"</_HG> </PropertyGroup> <Message Text="Getting build info from $(_HG)" Importance="high" /> + <MakeDir Directories="$(IntDir)" Condition="!Exists($(IntDir))" /> <Exec Command="$(_HG) id -b > "$(IntDir)hgbranch.txt"" ContinueOnError="true" /> <Exec Command="$(_HG) id -i > "$(IntDir)hgversion.txt"" ContinueOnError="true" /> <Exec Command="$(_HG) id -t > "$(IntDir)hgtag.txt"" ContinueOnError="true" /> |