diff options
| author | Ned Deily <nad@python.org> | 2017-03-04 06:34:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-04 06:34:19 (GMT) |
| commit | a2edd3ae4074952ce77d9319da2dbb2a47300c27 (patch) | |
| tree | babf6e2bb4f639fb1139819e9fcc054cf7434fd5 /configure.ac | |
| parent | 2df52acce2471f6ee27cdcd5f525538abbc13313 (diff) | |
| download | cpython-a2edd3ae4074952ce77d9319da2dbb2a47300c27.zip cpython-a2edd3ae4074952ce77d9319da2dbb2a47300c27.tar.gz cpython-a2edd3ae4074952ce77d9319da2dbb2a47300c27.tar.bz2 | |
[3.5] bpo-27593: Get SCM build info from git instead of hg. (#446) (#454) (#455)
* bpo-27593: Get SCM build info from git instead of hg. (#446)
sys.version and the platform module python_build(),
python_branch(), and python_revision() functions now use
git information rather than hg when building from a repo.
Based on original patches by Brett Cannon and Steve Dower.
(cherry picked from commit 5c4b0d063aba0a68c325073f5f312a2c9f40d178)
(cherry picked from commit 95c50e5aed9e5683676e18349dd94b11901a66b3)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 49d1a37..4682341 100644 --- a/configure.ac +++ b/configure.ac @@ -25,25 +25,25 @@ else BASECPPFLAGS="" fi -AC_SUBST(HGVERSION) -AC_SUBST(HGTAG) -AC_SUBST(HGBRANCH) +AC_SUBST(GITVERSION) +AC_SUBST(GITTAG) +AC_SUBST(GITBRANCH) -if test -e $srcdir/.hg/dirstate +if test -e $srcdir/.git/HEAD then -AC_CHECK_PROG(HAS_HG, hg, found, not-found) +AC_CHECK_PROG(HAS_GIT, git, found, not-found) else -HAS_HG=no-repository +HAS_GIT=no-repository fi -if test $HAS_HG = found +if test $HAS_GIT = found then - HGVERSION="hg id -i \$(srcdir)" - HGTAG="hg id -t \$(srcdir)" - HGBRANCH="hg id -b \$(srcdir)" + GITVERSION="git -C \$(srcdir) rev-parse HEAD" + GITTAG="git -C \$(srcdir) name-rev --tags --name-only HEAD" + GITBRANCH="git -C \$(srcdir) name-rev --name-only HEAD" else - HGVERSION="" - HGTAG="" - HGBRANCH="" + GITVERSION="" + GITTAG="" + GITBRANCH="" fi AC_CONFIG_SRCDIR([Include/object.h]) |