build: Refactor the earlier "basebranch" commit
Recap from earlier commit: If you have a development branch for a major project that will receive gerrit reviews it'll probably be named something like "development/16/newproject" or a work branch based on that "development" branch. That will necessitate setting "defaultbranch=development/16/newproject" in .gitreview. The make_version script uses that variable to construct the asterisk version however, which results in versions like "GIT-development/16/newproject-ee582a8c7b" which is probably not what you want. It also constructs the URLs for downloading external modules with that version, which will fail. Fast-forward: The earlier attempt at adding a "basebranch" variable to .gitreview didn't work out too well in practice because changes were made to .gitreview, which is a checked-in file. So, if you wanted to rebase your work branch on the base branch, rebase would attempt to overwrite your .gitreview with the one from the base branch and complain about a conflict. This is a slighltly different approach that adds three methods to determine the mainline branch: 1. --- MAINLINE_BRANCH from the environment If MAINLINE_BRANCH is already set in the environment, that will be used. This is primarily for the Jenkins jobs. 2. --- .develvars Instead of storing the basebranch in .gitreview, it can now be stored in a non-checked-in ".develvars" file and keyed by the current branch. So, if you were working on a branch named "new-feature-work" based on "development/16/new-feature" and wanted to push to that branch in Gerrit but wanted to pull the external modules for 16, you'd create the following .develvars file: [branch "new-feature-work"] mainline-branch = 16 The .gitreview file would still look like: [gerrit] defaultbranch=development/16/new-feature ...which would cause any reviews pushed from "new-feature-work" to go to the "development/16/new-feature" branch in Gerrit. The key is that the .develvars file is NEVER checked in (it's been added to .gitignore). 3. --- Well Known Development Branch If you're actually working in a branch named like "development/<mainline_branch>/some-feature", the mainline branch will be parsed from it. 4. --- .gitreview If none of the earlier conditions exist, the .gitreview "defaultbranch" variable will be used just as before. Change-Id: I1cdeeaa0944bba3f2e01d7a2039559d0c266f8c9
This commit is contained in:
parent
dd7db5c698
commit
1950cec3fd
|
@ -37,4 +37,4 @@ doxygen.log
|
||||||
out/
|
out/
|
||||||
*.orig
|
*.orig
|
||||||
tests/CI/output
|
tests/CI/output
|
||||||
|
.develvars
|
||||||
|
|
|
@ -3,11 +3,13 @@
|
||||||
AWK=${AWK:-awk}
|
AWK=${AWK:-awk}
|
||||||
GIT=${GIT:-git}
|
GIT=${GIT:-git}
|
||||||
GREP=${GREP:-grep}
|
GREP=${GREP:-grep}
|
||||||
|
SED=${SED:-sed}
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
|
PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | ${SED} -e 's:^.*/svn/asterisk/::' | ${SED} -e 's:/: :g'`
|
||||||
BRANCH=0
|
BRANCH=0
|
||||||
TEAM=0
|
TEAM=0
|
||||||
TAG=0
|
TAG=0
|
||||||
|
@ -98,12 +100,29 @@ elif [ -d ${1}/.git ]; then
|
||||||
# If the first log commit messages indicates that this is checked into
|
# If the first log commit messages indicates that this is checked into
|
||||||
# subversion, we'll just use the SVN- form of the revision.
|
# subversion, we'll just use the SVN- form of the revision.
|
||||||
MODIFIED=""
|
MODIFIED=""
|
||||||
SVN_REV=`${GIT} log --pretty=full -1 | sed -n '/git-svn-id:/ s/.*\@\([^ ]*\) .*/\1/p'`
|
SVN_REV=`${GIT} log --pretty=full -1 | ${SED} -n '/git-svn-id:/ s/.*\@\([^ ]*\) .*/\1/p'`
|
||||||
if [ -z "$SVN_REV" ]; then
|
if [ -z "$SVN_REV" ]; then
|
||||||
MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.basebranch)
|
# 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
|
if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
|
||||||
MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.defaultbranch)
|
MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.defaultbranch)
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
VERSION=`${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
|
||||||
|
@ -116,7 +135,7 @@ elif [ -d ${1}/.git ]; then
|
||||||
fi
|
fi
|
||||||
echo GIT-${MAINLINE_BRANCH}-${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
|
||||||
TEAM=0
|
TEAM=0
|
||||||
TAG=0
|
TAG=0
|
||||||
|
|
|
@ -17,6 +17,10 @@ if [ -z $BRANCH_NAME ]; then
|
||||||
BRANCH_NAME=$(git config -f .gitreview --get gerrit.defaultbranch)
|
BRANCH_NAME=$(git config -f .gitreview --get gerrit.defaultbranch)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$BRANCH_NAME" =~ devel(opment)?/([0-9]+)/.+ ]] ; then
|
||||||
|
export MAINLINE_BRANCH="${BASH_REMATCH[2]}"
|
||||||
|
fi
|
||||||
|
|
||||||
gen_cats() {
|
gen_cats() {
|
||||||
set +x
|
set +x
|
||||||
action=$1
|
action=$1
|
||||||
|
@ -91,6 +95,11 @@ MAKE=`which make`
|
||||||
PKGCONFIG=`which pkg-config`
|
PKGCONFIG=`which pkg-config`
|
||||||
_libdir=`${CIDIR}/findLibdir.sh`
|
_libdir=`${CIDIR}/findLibdir.sh`
|
||||||
|
|
||||||
|
_version=$(./build_tools/make_version .)
|
||||||
|
for var in BRANCH_NAME MAINLINE_BRANCH OUTPUT_DIR CACHE_DIR CCACHE_DISABLE CCACHE_DIR _libdir _version ; do
|
||||||
|
declare -p $var || :
|
||||||
|
done
|
||||||
|
|
||||||
common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"
|
common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"
|
||||||
$PKGCONFIG 'jansson >= 2.11' || common_config_args+=" --with-jansson-bundled"
|
$PKGCONFIG 'jansson >= 2.11' || common_config_args+=" --with-jansson-bundled"
|
||||||
common_config_args+=" ${CACHE_DIR:+--with-sounds-cache=${CACHE_DIR}/sounds --with-externals-cache=${CACHE_DIR}/externals}"
|
common_config_args+=" ${CACHE_DIR:+--with-sounds-cache=${CACHE_DIR}/sounds --with-externals-cache=${CACHE_DIR}/externals}"
|
||||||
|
|
|
@ -10,8 +10,17 @@ MAKE=`which make`
|
||||||
if [ x"$DESTDIR" != x ] ; then
|
if [ x"$DESTDIR" != x ] ; then
|
||||||
mkdir -p "$DESTDIR"
|
mkdir -p "$DESTDIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$BRANCH_NAME" =~ devel(opment)?/([0-9]+)/.+ ]] ; then
|
||||||
|
export MAINLINE_BRANCH="${BASH_REMATCH[2]}"
|
||||||
|
fi
|
||||||
|
_version=$(./build_tools/make_version .)
|
||||||
|
|
||||||
destdir=${DESTDIR:+DESTDIR=$DESTDIR}
|
destdir=${DESTDIR:+DESTDIR=$DESTDIR}
|
||||||
|
|
||||||
|
declare -p _version
|
||||||
|
declare -p destdir
|
||||||
|
|
||||||
[ $UNINSTALL -gt 0 ] && ${MAKE} ${destdir} uninstall
|
[ $UNINSTALL -gt 0 ] && ${MAKE} ${destdir} uninstall
|
||||||
[ $UNINSTALL_ALL -gt 0 ] && ${MAKE} ${destdir} uninstall-all
|
[ $UNINSTALL_ALL -gt 0 ] && ${MAKE} ${destdir} uninstall-all
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue