kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

build_tools/make_version: Update version parsing for Git migration

Browse Source 
External systems - such as the Asterisk Test Suite - require knowledge of the
upstream branch. Unfortunately, after moving to Git, the Asterisk version
currently consists of only a 'GIT" prefix followed by an object blob,
e.g., GIT-as08d7. This makes it difficult for such systems to know what
features are available in a particular check out of Asterisk.

This patch fixes this by hardcoding the branch in a variable in the
make_version script. Since the mainline branches are not changed often -
typically only once a year - this is a reasonable approach to solving
the problem, and is more reliable than parsing the output of 'git branch
-vv'. Branches that track off of an upstream primary branch will then get the
benefit of knowing which mainline branch they are currently based off
of.

ASTERISK-24954 #close

Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799
This commit is contained in:
Matt Jordan
2015-04-13 09:54:18 -05:00
parent 1174ef588d
commit 3f9aa29945
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build_tools/make_version
View File

@@ -3,6 +3,7 @@
AWK=${AWK:-awk} AWK=${AWK:-awk}
GIT=${GIT:-git} GIT=${GIT:-git}
GREP=${GREP:-grep} GREP=${GREP:-grep}
MAINLINE_BRANCH=master
if [ -f ${1}/.version ]; then if [ -f ${1}/.version ]; then
cat ${1}/.version cat ${1}/.version
@@ -98,16 +99,16 @@ 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-`${GIT} describe --long --always --tags --dirty=M 2> /dev/null` VERSION=`${GIT} describe --long --always --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"
fi fi
# Some older versions of git do not support all the above # Some older versions of git do not support all the above
# options. # options.
VERSION=GIT-`${GIT} rev-parse --short --verify HEAD`${MODIFIED} VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
fi fi
echo ${VERSION} echo GIT-${MAINLINE_BRANCH}-${VERSION}
else 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'` 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 BRANCH=0