diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-05-02 21:50:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 21:50:09 +0200 |
| commit | fd6c8bb89e834898c26620c9ab9afc6aaecb6b28 (patch) | |
| tree | 485a2c71340d0480e1580c75692037e3b7cc5114 /PCbuild | |
| parent | 8e158b2316385497c7b6b818d8b45855d7f87f0b (diff) | |
| download | cpython-git-fd6c8bb89e834898c26620c9ab9afc6aaecb6b28.tar.gz | |
bpo-27593: Revise git SCM build info. (#744) (#746) (#1392)
Use --short form of git hash. Use output from "git describe" for tag.
Expected outputs:
1. previous hg
2. previous git
3. updated git
Release (tagged) build:
1. Python 3.7.0a0 (v3.7.0a0:4def2a2901a5, ...
2. Python 3.7.0a0 (v3.7.0a0^0:05f53735c8912f8df1077e897f052571e13c3496, ...
3. Python 3.7.0a0 (v3.7.0a0:05f53735c8, ...
Development build:
1. Python 3.7.0a0 (default:41df79263a11, ...
2. Python 3.7.0a0 (master:05f53735c8912f8df1077e897f052571e13c3496, ...
3. Python 3.7.0a0 (heads/master-dirty:05f53735c8, ...
"dirty" means the working tree has uncommitted changes.
See "git help describe" for more info.
(cherry picked from commit 554626ada769abf82a5dabe6966afa4265acb6a6)
(cherry picked from commit ed512cba78af211da4d83cbb7cc533c39176f374)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index b894e27f83..99291ea5a9 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -399,8 +399,8 @@ <Message Text="Getting build info from $(_GIT)" Importance="high" /> <MakeDir Directories="$(IntDir)" Condition="!Exists($(IntDir))" /> <Exec Command="$(_GIT) name-rev --name-only HEAD > "$(IntDir)gitbranch.txt"" ContinueOnError="true" /> - <Exec Command="$(_GIT) rev-parse HEAD > "$(IntDir)gitversion.txt"" ContinueOnError="true" /> - <Exec Command="$(_GIT) name-rev --tags --name-only HEAD > "$(IntDir)gittag.txt"" ContinueOnError="true" /> + <Exec Command="$(_GIT) rev-parse --short HEAD > "$(IntDir)gitversion.txt"" ContinueOnError="true" /> + <Exec Command="$(_GIT) describe --all --always --dirty > "$(IntDir)gittag.txt"" ContinueOnError="true" /> <PropertyGroup> <GitBranch Condition="Exists('$(IntDir)gitbranch.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gitbranch.txt').Trim())</GitBranch> <GitVersion Condition="Exists('$(IntDir)gitversion.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gitversion.txt').Trim())</GitVersion> |