From 633c34c411e1e7112a3a2806bd1c421bcd70e3c9 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Fri, 22 Jul 2016 06:01:15 -0600 Subject: [PATCH] build_tools: Update make_version for 14 Also remove svn stuff Change-Id: I95d762f7cbbe5eb01117bde8779515d51a0bb06a --- build_tools/make_version | 80 +--------------------------------------- 1 file changed, 1 insertion(+), 79 deletions(-) diff --git a/build_tools/make_version b/build_tools/make_version index fd14a550aa..616316fa83 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -3,88 +3,10 @@ AWK=${AWK:-awk} GIT=${GIT:-git} GREP=${GREP:-grep} -MAINLINE_BRANCH=master +MAINLINE_BRANCH=14 if [ -f ${1}/.version ]; then cat ${1}/.version -elif [ -d ${1}/.svn ]; then - PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'` - BRANCH=0 - TEAM=0 - TAG=0 - FEATURE=0 - - REV=`svnversion -c ${1} | cut -d: -f2` - - INTEGRATED=`LANG=C svn pg automerge-propname ${1}` - if [ -z "${INTEGRATED}" ] ; then - INTEGRATED=svnmerge-integrated - fi - - BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1` - - if [ "${PARTS}" = "trunk" ] ; then - echo SVN-trunk-r${REV} - exit 0 - fi - - for PART in $PARTS ; do - if [ ${TAG} != 0 ] ; then - if [ "${PART}" = "autotag_for_be" ] ; then - continue - fi - if [ "${PART}" = "autotag_for_sx00i" ] ; then - continue - fi - RESULT="${PART}" - break - fi - - if [ ${BRANCH} != 0 ] ; then - RESULT="${RESULT}-${PART}" - if [ ${FEATURE} != 0 ] ; then - RESULT="${RESULT}-${FEATURE_NAME}" - fi - break - fi - - if [ ${TEAM} != 0 ] ; then - if [ -z "${RESULT}" ] ; then - RESULT="${PART}" - else - RESULT="${RESULT}-${PART}" - fi - continue - fi - - if [ "${PART}" = "certified" ] ; then - FEATURE=1 - FEATURE_NAME="cert" - continue - fi - - if [ "${PART}" = "branches" ] ; then - BRANCH=1 - RESULT="branch" - continue - fi - - if [ "${PART}" = "tags" ] ; then - TAG=1 - continue - fi - - if [ "${PART}" = "team" ] ; then - TEAM=1 - continue - fi - done - - if [ ${TAG} != 0 ] ; then - echo ${RESULT} - else - echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}} - fi elif [ -d ${1}/.git ]; then if [ -z ${GIT} ]; then GIT="git" -- 2.47.2