FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build_tools/make_version: If making from a tag show only the tag in the version.

Browse Source 
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 <sruffell@digium.com>
(cherry picked from commit 37371f19e9)
This commit is contained in:
Shaun Ruffell 2013-01-25 12:54:18 -06:00
parent fcaec330e5
commit 2a5638deef
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -67,13 +67,7 @@ GENERATED_DOCS:=README.html
ifneq ($(wildcard .version),) ifneq ($(wildcard .version),)
DAHDIVERSION:=$(shell cat .version) DAHDIVERSION:=$(shell cat .version)
else else
ifneq ($(wildcard .svn),)
DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux) DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux)
else
ifneq ($(wildcard .git),)
DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux)
endif
endif
endif endif
all: modules all: modules

6
build_tools/make_version
View File

@ -59,7 +59,7 @@ elif [ -d ${1}/.git ]; then
MODIFIED="" MODIFIED=""
SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
if [ -z "$SVN_REV" ]; then 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 [ $? -ne 0 ]; then
if [ "`git ls-files -m | wc -l`" != "0" ]; then if [ "`git ls-files -m | wc -l`" != "0" ]; then
MODIFIED="M" MODIFIED="M"
@ -115,4 +115,8 @@ elif [ -d ${1}/.git ]; then
echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED} echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
fi fi
else
# Use the directory information in the absence of any other version
# information
pwd -P
fi fi