diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-11-22 11:48:52 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-11-22 11:48:52 -0800 |
| commit | af9f7d8bc43549e6ba121beecac53fe663ee01ca (patch) | |
| tree | 2c71d69513045207b0337d7866d060b3c1fed630 /PCbuild | |
| parent | 4d83386bceca38593641c1921fb175a541fb88c2 (diff) | |
| download | cpython-af9f7d8bc43549e6ba121beecac53fe663ee01ca.tar.gz | |
Issue #28573: Missing sys._mercurial info and other build issues.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 963da89c44..89415ae087 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -406,14 +406,21 @@ <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> <HgTag Condition="Exists('$(IntDir)hgtag.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgtag.txt').Trim())</HgTag> </PropertyGroup> + <Message Text="Building $(HgTag):$(HgVersion) $(HgBranch)" Importance="high" /> <ItemGroup> <ClCompile Include="..\Modules\getbuildinfo.c"> <PreprocessorDefinitions>HGVERSION="$(HgVersion)";HGTAG="$(HgTag)";HGBRANCH="$(HgBranch)";%(PreprocessorDefinitions)</PreprocessorDefinitions> |