diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-02-11 17:51:54 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-02-11 17:51:54 +0000 |
| commit | 72806e6d9966f46c4de58bce985e31e6e53ceef8 (patch) | |
| tree | 4d2a56a31cd8ebbc52f9bdff8ebff517a608dd3c | |
| parent | 9a4febdd64b2f0a8e71a8ac8c694f3fcd05d287c (diff) | |
dahdi: Generate include/dahdi/version.h when building in a git repository.
If building within a git repository search the last log message for a
'git-svn-id'. If found, the commit has a corresponding svn revision
number and we will use the SVN-xxx-rxxx revision form. Otherwise use the
output of 'git describe --long --always --tags --dirty=M' as the
version.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9396
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9757 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | build_tools/make_version | 62 |
2 files changed, 66 insertions, 0 deletions
@@ -69,6 +69,10 @@ ifneq ($(wildcard .version),) else ifneq ($(wildcard .svn),) DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux) +else +ifneq ($(wildcard .git),) + DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux) +endif endif endif diff --git a/build_tools/make_version b/build_tools/make_version index e6caaa2..6946831 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -53,4 +53,66 @@ elif [ -d .svn ]; then done echo SVN-${RESULT##-}-r${REV} +elif [ -d .git ]; then + # If the first log commit messages indicates that this is checked into + # subversion, we'll just use the SVN- form of the revision. + MODIFIED="" + SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` + if [ -z "$SVN_REV" ]; then + VERSION=`git describe --long --always --tags --dirty=M 2> /dev/null` + if [[ $? -ne 0 ]]; then + if [[ "`git ls-files -m | wc -l`" != "0" ]]; then + MODIFIED="M" + fi + # Some older versions of git do not support all the above + # options. + VERSION=GIT-`git log --abbrev-commit -1 --pretty=oneline --abbrev=7 | cut -f 1 -d .`${MODIFIED} + fi + echo ${VERSION} + else + PARTS=`LANG=C git log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'` + BRANCH=0 + TEAM=0 + + if [[ "`git ls-files -m | wc -l`" != "0" ]]; then + MODIFIED="M" + fi + + if [ "${PARTS}" = "trunk" ]; then + echo SVN-'trunk'-r${SVN_REV}${MODIFIED} + exit 0 + fi + + for PART in $PARTS + do + if [ ${BRANCH} != 0 ]; then + RESULT="${RESULT}-${PART}" + break + fi + + if [ ${TEAM} != 0 ]; then + RESULT="${RESULT}-${PART}" + continue + fi + + if [ "${PART}" = "branches" ]; then + BRANCH=1 + RESULT="branch" + continue + fi + + if [ "${PART}" = "tags" ]; then + BRANCH=1 + RESULT="tag" + continue + fi + + if [ "${PART}" = "team" ]; then + TEAM=1 + continue + fi + done + + echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED} + fi fi |