From 2a5638deef0ac2381181f143c8bcda0cdf1c0751 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 25 Jan 2013 12:54:18 -0600 Subject: [PATCH] build_tools/make_version: If making from a tag show only the tag in the version. Also, if there is no other version information use the directory name. Downloads from gitweb will include the sha information in the build and otherwise a user could locate the source directory via the embedded version information. I believe this is better than an empty string. Signed-off-by: Shaun Ruffell (cherry picked from commit 37371f19e97e5af645082fcafa42d9e18ef574e5) --- Makefile | 6 ------ build_tools/make_version | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7e478ca..73a30b5 100644 --- a/Makefile +++ b/Makefile @@ -67,13 +67,7 @@ GENERATED_DOCS:=README.html ifneq ($(wildcard .version),) DAHDIVERSION:=$(shell cat .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 all: modules diff --git a/build_tools/make_version b/build_tools/make_version index b9bb29f..d06a6bc 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -59,7 +59,7 @@ elif [ -d ${1}/.git ]; then 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` + VERSION=`git describe --tags --dirty=M 2> /dev/null` if [ $? -ne 0 ]; then if [ "`git ls-files -m | wc -l`" != "0" ]; then MODIFIED="M" @@ -115,4 +115,8 @@ elif [ -d ${1}/.git ]; then echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED} fi +else + # Use the directory information in the absence of any other version + # information + pwd -P fi