[svn-commits] tilghman: branch 1.6.0 r234701 - in /branches/1.6.0: ./ build_tools/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Dec 14 15:14:59 2009
New Revision: 234701

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234701
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/make_version_c
    branches/1.6.0/build_tools/make_version_h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/make_version_c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/build_tools/make_version_c?view=diff&rev=234701&r1=234700&r2=234701
==============================================================================
--- branches/1.6.0/build_tools/make_version_c (original)
+++ branches/1.6.0/build_tools/make_version_c Mon Dec 14 15:14:59 2009
@@ -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`

Modified: branches/1.6.0/build_tools/make_version_h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/build_tools/make_version_h?view=diff&rev=234701&r1=234700&r2=234701
==============================================================================
--- branches/1.6.0/build_tools/make_version_h (original)
+++ branches/1.6.0/build_tools/make_version_h Mon Dec 14 15:14:59 2009
@@ -1,11 +1,22 @@
 #!/bin/sh
-if [ ! -f .flavor ]; then
+if test ! -f .flavor ; then
     cat << END
 /*
  * version.h 
  * Automatically generated
  */
 #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