Merged revisions 234700 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r234700 | tilghman | 2009-12-14 15:13:18 -0600 (Mon, 14 Dec 2009) | 12 lines

  Merged revisions 234699 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r234699 | tilghman | 2009-12-14 15:09:56 -0600 (Mon, 14 Dec 2009) | 5 lines

    Deal with the situation where .flavor exists but .version does not.
    Also make the script slightly more portable, in keeping with autoconf syntax.
    (closes issue #14737)
     Reported by: davidw
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@234702 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/make_version_c b/build_tools/make_version_c
index b3a3e846e399b93b663bb168a64a9373349f1461..3fea6cea2d5b5bafcc2dadc75ee9382236d7aae7 100755 (executable)
--- a/build_tools/make_version_c
+++ b/build_tools/make_version_c
@@ -1,6 +1,9 @@
 #!/bin/sh
-if [ ! -f .flavor ]; then
+if test ! -f .flavor ; then
     EXTRA=""
+elif test ! -f .version ; then
+       aadkflavor=`cat .flavor`
+    EXTRA=" (${aadkflavor})"
 else
     aadkver=`cat .version`
     aadkflavor=`cat .flavor`

diff --git a/build_tools/make_version_h b/build_tools/make_version_h
index 834a3c391ce34e96e5e1c0215c489fa8bdf95c49..5c74716f20b6fdf83a6d101e6564ce90d898e849 100755 (executable)
--- a/build_tools/make_version_h
+++ b/build_tools/make_version_h
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ ! -f .flavor ]; then
+if test ! -f .flavor ; then
     cat << END
 /*
  * version.h 
@@ -8,6 +8,17 @@ if [ ! -f .flavor ]; then
 #define ASTERISK_VERSION "${ASTERISKVERSION}"
 #define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
 
+END
+elif test ! -f .version ; then
+    aadkflavor=`cat .flavor`
+    cat << END
+/*
+ * version.h 
+ * Automatically generated
+ */
+#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor})"
+#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
+
 END
 else
     aadkver=`cat .version`