diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-05-28 08:14:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-05-28 10:05:16 -0700 |
| commit | 745670bc73d364a25d39b31d89daece8dba48160 (patch) | |
| tree | 1b52729b25b21aaf5c74c636dc0b5acd4159abc4 /config/gr_git.m4 | |
| parent | a50d394d28955d6f0ecd9a3f5f10a902dbeae7ec (diff) | |
build: refactor GR_GIT and GR_VERSION
Diffstat (limited to 'config/gr_git.m4')
| -rw-r--r-- | config/gr_git.m4 | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/config/gr_git.m4 b/config/gr_git.m4 index e274607137..5e8aa663b1 100644 --- a/config/gr_git.m4 +++ b/config/gr_git.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2009 Free Software Foundation, Inc. +dnl Copyright 2009,2010 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -29,14 +29,30 @@ AC_DEFUN([GR_GIT],[ AC_MSG_RESULT([ok]) AC_MSG_CHECKING([git description of current commit]) if (cd $srcdir && $GIT describe >/dev/null 2>&1); then - GIT_VERSION=`cd $srcdir && $GIT describe --abbrev=8 | cut -f 2- -d '-'` - AC_MSG_RESULT([$GIT_DESCRIBE]) + GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long` + GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'` + GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'` + GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'` + # Release candidate tags create an extra -rcX field + if test x`echo $GIT_DESCRIBE | cut -f 1- -d '-' --output-delimiter=' ' | wc -w` = x4; then + GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'` + GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'` + GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'` + fi + AC_MSG_RESULT([$GIT_DESCRIBE]) else AC_MSG_RESULT([unable to find, using current commit]) - GIT_VERSION=`cd $srcdir && $GIT describe --always --abbrev=8` + GIT_TAG='' + GIT_SEQNO='' + GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8` fi else AC_MSG_RESULT([not found]) fi + + AC_SUBST([GIT_DESCRIBE]) + AC_SUBST([GIT_TAG]) + AC_SUBST([GIT_SEQNO]) + AC_SUBST([GIT_COMMIT]) fi ]) |