[asterisk-commits] kpfleming: trunk r56373 - in /trunk: ./ build_tools/make_version_h

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Feb 23 13:00:23 2007
New Revision: 56373

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56373
Log:
Merged revisions 56372 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56372 | kpfleming | 2007-02-23 12:59:09 -0600 (Fri, 23 Feb 2007) | 2 lines

build special version strings for AADK/S800i builds

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_version_h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/build_tools/make_version_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_version_h?view=diff&rev=56373&r1=56372&r2=56373
==============================================================================
--- trunk/build_tools/make_version_h (original)
+++ trunk/build_tools/make_version_h Fri Feb 23 13:00:23 2007
@@ -1,5 +1,6 @@
 #!/bin/sh
-cat << END
+if [ ! -f ../.flavor ]; then
+    cat << END
 /*
  * version.h 
  * Automatically generated
@@ -8,3 +9,17 @@
 #define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
 
 END
+else
+    aadkver=`cat ../.version`
+    aadkflavor=`cat ../.flavor`
+    cat << END
+/*
+ * version.h 
+ * Automatically generated
+ */
+#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor} ${aadkver})"
+#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
+
+END
+fi
+