Skip to content
Snippets Groups Projects
Commit d38f08c7 authored by Matt Jordan's avatar Matt Jordan
Browse files

build_tools/make_version: Update version parsing for Git migration

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
parent 7175c668
No related merge requests found
#!/bin/sh #!/bin/sh
MAINLINE_BRANCH=11
if [ -f ${1}/.version ]; then if [ -f ${1}/.version ]; then
cat ${1}/.version cat ${1}/.version
elif [ -d ${1}/.svn ]; then elif [ -d ${1}/.svn ]; then
...@@ -94,16 +96,16 @@ elif [ -d ${1}/.git ]; then ...@@ -94,16 +96,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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment