From 19d616d4dc4be2d5113e6c31cccb33b97ec3f977 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo <rizzo@icir.org> Date: Mon, 10 Dec 2007 09:00:44 +0000 Subject: [PATCH] simplify/cleanup the scripts git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92122 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- build_tools/make_version | 53 +++++++++++++++----------------------- build_tools/make_version_h | 18 ++++--------- 2 files changed, 26 insertions(+), 45 deletions(-) diff --git a/build_tools/make_version b/build_tools/make_version index 0cde99d21b..b06044e1e6 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -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 diff --git a/build_tools/make_version_h b/build_tools/make_version_h index 0b651ad009..6d901c2fa8 100755 --- a/build_tools/make_version_h +++ b/build_tools/make_version_h @@ -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 - -- GitLab