diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 11:18:53 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 11:18:53 -0800 |
| commit | 190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b (patch) | |
| tree | 1c1a16cc7207424cf8e1d4431f816537cb6fd2d4 /PCbuild/pythoncore.vcxproj | |
| parent | 2d397dc44b6023aebdaf0fc44bca66752d3ffb03 (diff) | |
| download | cpython-git-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.gz | |
Issue #28846: Various installer fixes
Diffstat (limited to 'PCbuild/pythoncore.vcxproj')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index e5e96ad65e..dc5c6703c7 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> |