From 721270ebad0a80fd3a608c4a6bd8c4218c6b774a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 8 May 2006 08:27:22 +0000
Subject: r15510: As discussed on samba-technical, move the VERSION system back
 to a #define based system only.  This avoids allocation in the fault code.

Andrew Bartlett
(This used to be commit 31c97b4e67ba6a188d0ed4844ca4f2f86f29514f)
---
 source4/script/mkversion.sh | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'source4/script/mkversion.sh')

diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 7995027998..0dd80712ff 100755
--- a/source4/script/mkversion.sh
+++ b/source4/script/mkversion.sh
@@ -93,38 +93,30 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
     LANG=${_SAVE_LANG}
 fi
 
-##
-## Add a release nickname
-##
-if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
-    echo "#define SAMBA_VERSION_RELEASE_NICKNAME ${SAMBA_VERSION_RELEASE_NICKNAME}" >> $OUTPUT_FILE
-fi
+echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUTPUT_FILE
 
 ##
 ## Add the vendor string if present
 ##
 if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
     echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE
+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}"
     if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then
         echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE
+        SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}"
     fi
 fi
 
-echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUTPUT_FILE
-
-echo "#define SAMBA_VERSION_STRING samba_version_string()" >> $OUTPUT_FILE
-
-echo "$0: 'version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
-
+##
+## Add a release nickname
+##
 if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
-    echo "$0: with RELEASE_NICKNAME = ${SAMBA_VERSION_RELEASE_NICKNAME}"
+    echo "#define SAMBA_VERSION_RELEASE_NICKNAME ${SAMBA_VERSION_RELEASE_NICKNAME}" >> $OUTPUT_FILE
+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING} (${SAMBA_VERSION_RELEASE_NICKNAME})"
 fi
 
-if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-    echo "$0: with VENDOR_SUFFIX = ${SAMBA_VERSION_VENDOR_SUFFIX}"
-    if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then
-        echo "$0: with VENDOR_PATCH = ${SAMBA_VERSION_VENDOR_PATCH}"
-    fi
-fi
+echo "#define SAMBA_VERSION_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUTPUT_FILE
+
+echo "$0: 'version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
 
 exit 0
-- 
cgit