Matt Jordan has submitted this change and it was merged. Change subject: build_tools/make_version: Update version parsing for Git migration ......................................................................
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 --- M build_tools/make_version 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Matt Jordan: Looks good to me, approved; Verified George Joseph: Looks good to me, but someone else must approve diff --git a/build_tools/make_version b/build_tools/make_version index d11c096..99d5dee 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -3,6 +3,7 @@ AWK=${AWK:-awk} GIT=${GIT:-git} GREP=${GREP:-grep} +MAINLINE_BRANCH=13 if [ -f ${1}/.version ]; then cat ${1}/.version @@ -98,16 +99,16 @@ 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-`${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 [ "`${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} rev-parse --short --verify HEAD`${MODIFIED} + VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED} fi - echo ${VERSION} + echo GIT-${MAINLINE_BRANCH}-${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 -- To view, visit https://gerrit.asterisk.org/79 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: Matt Jordan <mjor...@digium.com> Gerrit-Reviewer: George Joseph <george.jos...@fairview5.com> Gerrit-Reviewer: Matt Jordan <mjor...@digium.com> -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev