mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-25 15:08:53 +00:00
port version string computation from trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
24
Makefile
24
Makefile
@@ -305,22 +305,26 @@ endif # WITHOUT_ZAPTEL
|
|||||||
LIBEDIT=editline/libedit.a
|
LIBEDIT=editline/libedit.a
|
||||||
|
|
||||||
ifneq ($(wildcard .version),)
|
ifneq ($(wildcard .version),)
|
||||||
ASTERISKVERSION=$(shell cat .version)
|
ASTERISKVERSION:=$(shell cat .version)
|
||||||
ASTERISKVERSIONNUM=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
|
ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
|
||||||
RPMVERSION=$(shell sed 's/[-\/:]/_/g' .version)
|
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
|
||||||
else
|
else
|
||||||
RPMVERSION=unknown
|
RPMVERSION=unknown
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard CVS),)
|
# CVS mirrors of SVN have .svnrevision files showing
|
||||||
|
# which SVN revision they are based on, and .svnbranch
|
||||||
|
# showing the branch they are made from
|
||||||
|
ifneq ($(wildcard .svnrevision),)
|
||||||
ASTERISKVERSIONNUM=999999
|
ASTERISKVERSIONNUM=999999
|
||||||
ifneq ($(wildcard CVS/Tag),)
|
ASTERISKVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
|
||||||
ASTERISKVERSION=$(shell echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`")
|
|
||||||
else
|
|
||||||
ASTERISKVERSION=CVS HEAD
|
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
ASTERISKVERSIONNUM=000000
|
ifneq ($(wildcard .svn),)
|
||||||
|
ASTERISKVERSIONNUM=999999
|
||||||
|
ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
|
||||||
|
else
|
||||||
|
ASTERISKVERSIONNUM=000000
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ASTCFLAGS+= $(DEBUG_THREADS)
|
ASTCFLAGS+= $(DEBUG_THREADS)
|
||||||
|
50
build_tools/make_svn_branch_name
Executable file
50
build_tools/make_svn_branch_name
Executable file
@@ -0,0 +1,50 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
PARTS=`svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :'`
|
||||||
|
BRANCH=0
|
||||||
|
TEAM=0
|
||||||
|
|
||||||
|
REV=`svn info | grep -e 'Last Changed Rev' | awk '{print $4;}'`
|
||||||
|
|
||||||
|
if [ "${PARTS}" == "trunk" ]
|
||||||
|
then
|
||||||
|
echo 'trunk'-r${REV}
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
for PART in $PARTS
|
||||||
|
do
|
||||||
|
if [ ${BRANCH} != 0 ]
|
||||||
|
then
|
||||||
|
RESULT="${RESULT}-${PART}"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ${TEAM} != 0 ]
|
||||||
|
then
|
||||||
|
RESULT="${RESULT}-${PART}"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${PART}" == "branches" ]
|
||||||
|
then
|
||||||
|
BRANCH=1
|
||||||
|
RESULT="branch"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${PART}" == "tags" ]
|
||||||
|
then
|
||||||
|
BRANCH=1
|
||||||
|
RESULT="tag"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${PART}" == "team" ]
|
||||||
|
then
|
||||||
|
TEAM=1
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo ${RESULT}-r${REV}
|
Reference in New Issue
Block a user