diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-14 21:15:19 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-14 21:15:19 +0000 |
| commit | 047eec45b43a428d625d4a507e5c11ee948fc5b4 (patch) | |
| tree | 6eb948f63e92cba2ff6657124a44ea29d03cf05c /build_tools | |
| parent | e6cfb53877ff8a1a4aff5eda24a4622d8b60710f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@234703 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_version_c | 5 | ||||
| -rwxr-xr-x | build_tools/make_version_h | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/build_tools/make_version_c b/build_tools/make_version_c index b3a3e846e..3fea6cea2 100755 --- 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 834a3c391..5c74716f2 100755 --- 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 @@ -9,6 +9,17 @@ if [ ! -f .flavor ]; then #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` aadkflavor=`cat .flavor` |