diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-22 20:25:41 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-22 20:25:41 +0000 |
| commit | 869b34a720c155810c90356f11321a5788bd7f3d (patch) | |
| tree | 76c0b4063ff15081957a30a123bd80164d4a1e6b /build_tools | |
| parent | e670d53f6a105d5a1748b1d16f2766b6a7ff1f06 (diff) | |
when building a version string for a developer branch, include the base branch in the version string
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@65541 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_version | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_tools/make_version b/build_tools/make_version index 6176de2c0..a29fe2b32 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -9,6 +9,8 @@ elif [ -d .svn ]; then TAG=0 REV=`svnversion -c ${1} | cut -d: -f2` + + BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1` if [ "${PARTS}" = "trunk" ] then @@ -60,6 +62,6 @@ elif [ -d .svn ]; then then echo ${RESULT} else - echo SVN-${RESULT##-}-r${REV} + echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}} fi fi |