diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:18:53 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:18:53 (GMT) |
| commit | 190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b (patch) | |
| tree | 1c1a16cc7207424cf8e1d4431f816537cb6fd2d4 /PCbuild | |
| parent | 2d397dc44b6023aebdaf0fc44bca66752d3ffb03 (diff) | |
| download | cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.zip cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.gz cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.bz2 | |
Issue #28846: Various installer fixes
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build.bat | 4 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 88b1f06..98fa267 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 e5e96ad..dc5c670 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -399,9 +399,15 @@ <ImportGroup Label="ExtensionTargets"> </ImportGroup> <Target Name="_GetBuildInfo" BeforeTargets="PrepareForBuild"> - <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" /> + <PropertyGroup> + <HG Condition="$(HG) == ''">hg</HG> + <_HG>$(HG)</_HG> + <_HG Condition="$(HG.Contains(` `))">"$(HG)"</_HG> + </PropertyGroup> + <Message Text="Getting build info from $(_HG)" Importance="high" /> + <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" /> <PropertyGroup> <HgBranch Condition="Exists('$(IntDir)hgbranch.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgbranch.txt').Trim())</HgBranch> <HgVersion Condition="Exists('$(IntDir)hgversion.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgversion.txt').Trim())</HgVersion> |