dect
/
asterisk
Archived
13
0
Fork 0

simplify/cleanup the scripts

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92122 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rizzo 2007-12-10 09:00:44 +00:00
parent 9401a82c4d
commit 797f1f0bed
2 changed files with 26 additions and 45 deletions

View File

@ -7,71 +7,60 @@ elif [ -d .svn ]; then
BRANCH=0
TEAM=0
TAG=0
REV=`svnversion -c ${1} | cut -d: -f2`
BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
if [ "${PARTS}" = "trunk" ]
then
if [ "${PARTS}" = "trunk" ] ; then
echo SVN-trunk-r${REV}
exit 0
fi
for PART in $PARTS
do
if [ ${TAG} != 0 ]
then
for PART in $PARTS ; do
if [ ${TAG} != 0 ] ; then
RESULT="${PART}"
break
fi
if [ ${BRANCH} != 0 ]
then
if [ -z ${RESULT} ]
then
if [ ${BRANCH} != 0 ] ; then
if [ -z ${RESULT} ] ; then
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"
fi
break
fi
if [ ${TEAM} != 0 ]
then
if [ -z ${RESULT} ]
then
if [ ${TEAM} != 0 ] ; then
if [ -z ${RESULT} ] ; then
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"
fi
continue
fi
if [ "${PART}" = "branches" ]
then
if [ "${PART}" = "branches" ] ; then
BRANCH=1
RESULT="branch"
continue
fi
if [ "${PART}" = "tags" ]
then
if [ "${PART}" = "tags" ] ; then
TAG=1
continue
fi
if [ "${PART}" = "team" ]
then
if [ "${PART}" = "team" ] ; then
TEAM=1
continue
fi
done
if [ ${TAG} != 0 ]
then
if [ ${TAG} != 0 ] ; then
echo ${RESULT}
else
else
echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
fi
fi

View File

@ -1,25 +1,17 @@
#!/bin/sh
if [ ! -f ../.flavor ]; then
cat << END
/*
* version.h
* Automatically generated
*/
#define ASTERISK_VERSION "${ASTERISKVERSION}"
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
END
EXTRA=""
else
aadkver=`cat ../.version`
aadkflavor=`cat ../.flavor`
cat << END
EXTRA=" (${aadkflavor} ${aadkver})"
fi
cat << END
/*
* version.h
* Automatically generated
*/
#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor} ${aadkver})"
#define ASTERISK_VERSION "${ASTERISKVERSION}${EXTRA}"
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
END
fi