Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

make_version: Strip svn stuff and suppress ref HEAD errors

Browse Source 
* All of the code that used subversion has been removed.

* When Asterisk is checked out from a tag or commit instead
  of one of the regular branches, git would emit messages like
  "fatal: ref HEAD is not a symbolic ref" which weren't fatal
  at all.  Those are now suppressed.

Change-Id: I2a11bc9ebbaf6dfa50f53516ede50a6bac65ca3c
pull/33/head
George Joseph 2 years ago committed by George Joseph
parent 92849c8c62
commit d433a048f7
1 changed files with 44 additions and 198 deletions
Show Stats Download Patch File Download Diff File

242
build_tools/make_version
Unescape View File

@ -1,220 +1,66 @@
#!/bin/sh #!/bin/sh
AWK=${AWK:-awk}
GIT=${GIT:-git} GIT=${GIT:-git}
GREP=${GREP:-grep}
SED=${SED:-sed} SED=${SED:-sed}
if [ -f ${1}/.version ]; then if [ -f ${1}/.version ]; then
cat ${1}/.version cat ${1}/.version
elif [ -d ${1}/.svn ]; then exit 0
PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | ${SED} -e 's:^.*/svn/asterisk/::' | ${SED} -e 's:/: :g'` fi
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 if [ ! -d ${1}/.git ]; then
RESULT="${RESULT}-${PART}" echo "UNKNOWN__and_probably_unsupported"
if [ ${FEATURE} != 0 ] ; then exit 0
RESULT="${RESULT}-${FEATURE_NAME}" fi
fi
break
fi
if [ ${TEAM} != 0 ] ; then if [ -z ${GIT} ]; then
if [ -z "${RESULT}" ] ; then GIT="git"
RESULT="${PART}" fi
else
RESULT="${RESULT}-${PART}"
fi
continue
fi
if [ "${PART}" = "certified" ] ; then if ! command -v ${GIT} >/dev/null 2>&1; then
FEATURE=1 echo "UNKNOWN__and_probably_unsupported"
FEATURE_NAME="cert" exit 1
continue fi
fi
if [ "${PART}" = "branches" ] ; then GITCHECK=$(${GIT} describe --always 2>/dev/null || echo gitfail 2>/dev/null)
BRANCH=1 if [ "x${GITCHECK}" = "xgitfail" ]; then
RESULT="branch" echo "UNKNOWN__git_check_fail"
continue exit 1
fi fi
if [ "${PART}" = "tags" ] ; then cd ${1} || exit 1
TAG=1
continue
fi
if [ "${PART}" = "team" ] ; then MODIFIED=""
TEAM=1
continue
fi
done
if [ ${TAG} != 0 ] ; then # If MAINLINE_BRANCH is already set in the environment, use it.
echo ${RESULT} if [ -z "${MAINLINE_BRANCH}" ] ; then
else # Try to retrieve MAINLINE_BRANCH from a local .develvars file first.
echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}} # .develvars is keyed by the branch name so we need to get that first.
fi BRANCH=$(${GIT} symbolic-ref --short HEAD 2>/dev/null)
elif [ -d ${1}/.git ]; then if [ -f .develvars ] ; then
if [ -z ${GIT} ]; then MAINLINE_BRANCH=$(${GIT} config -f .develvars --get branch.${BRANCH}.mainline-branch)
GIT="git"
fi fi
if ! command -v ${GIT} >/dev/null 2>&1; then # If we didn't find it, see if this is a well-known development branch.
echo "UNKNOWN__and_probably_unsupported" # development/<mainline_branch>/<branchname> or
exit 1 # devel/<mainline_branch>/<branchname>
if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
MAINLINE_BRANCH=$(echo "${BRANCH}" | ${SED} -n -r -e "s@devel(opment)?/([0-9]+)/.+@\2@p")
fi fi
GITCHECK=$(${GIT} describe --always 2>/dev/null || echo gitfail 2>/dev/null) # If we didn't find it, get it from .gitreview defaultbranch.
if [ "x${GITCHECK}" = "xgitfail" ]; then if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
echo "UNKNOWN__git_check_fail" MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.defaultbranch)
exit 1
fi fi
fi
cd ${1} VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
if [ $? -ne 0 ]; then
# If the first log commit messages indicates that this is checked into if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
# subversion, we'll just use the SVN- form of the revision. MODIFIED="M"
MODIFIED=""
SVN_REV=`${GIT} log --pretty=full -1 | ${SED} -n '/git-svn-id:/ s/.*\@\([^ ]*\) .*/\1/p'`
if [ -z "$SVN_REV" ]; then
# If MAINLINE_BRANCH is already set in the environment, use it.
if [ -z "${MAINLINE_BRANCH}" ] ; then
# Try to retrieve MAINLINE_BRANCH from a local .develvars file first.
# .develvars is keyed by the branch name so we need to get that first.
BRANCH=$(${GIT} symbolic-ref --short HEAD)
if [ -f .develvars ] ; then
MAINLINE_BRANCH=$(${GIT} config -f .develvars --get branch.${BRANCH}.mainline-branch)
fi
# If we didn't find it, see if this is a well-known development branch.
# development/<mainline_branch>/<branchname> or
# devel/<mainline_branch>/<branchname>
if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
MAINLINE_BRANCH=$(echo "${BRANCH}" | ${SED} -n -r -e "s@devel(opment)?/([0-9]+)/.+@\2@p")
fi
# If we didn't find it, get it from .gitreview defaultbranch.
if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.defaultbranch)
fi
fi
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} rev-parse --short --verify HEAD`${MODIFIED}
fi
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
TEAM=0
TAG=0
FEATURE=0
if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
MODIFIED="M"
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
if [ "${PART}" = "trunk" ]; then
echo SVN-trunk-r${SVN_REV}${MODIFIED}
exit 0
fi
done
if [ ${TAG} != 0 ] ; then
echo ${RESULT}
else
echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
fi
fi fi
else # Some older versions of git do not support all the above
echo "UNKNOWN__and_probably_unsupported" # options.
VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
fi fi
echo GIT-${MAINLINE_BRANCH}-${VERSION}

Write Preview
Loading…
Cancel
Save