simplify/cleanup the scripts
authorLuigi Rizzo <rizzo@icir.org>
Mon, 10 Dec 2007 09:00:44 +0000 (09:00 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Mon, 10 Dec 2007 09:00:44 +0000 (09:00 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92122 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/make_version
build_tools/make_version_h

index 0cde99d..b06044e 100755 (executable)
@@ -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
index 0b651ad..6d901c2 100755 (executable)
@@ -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
-