r13077: Allow the mkversion script to be used for technology preview releases

(This used to be commit 2636e6c948c850e61debf75ff63b5d02f537e917)

diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 9d919cfe34b776562a35586f3dded33dd8222d38..8e5fea5c8b3f869f3b056104305b687743ad86ad 100755 (executable)
--- a/source4/script/mkversion.sh
+++ b/source4/script/mkversion.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-#
 
 VERSION_FILE=$1
 OUTPUT_FILE=$2
@@ -24,6 +23,8 @@ SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR
 
 SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
 
+SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
+
 SAMBA_VERSION_IS_SVN_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_SVN_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE`
 
 SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE`
@@ -47,10 +48,10 @@ elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
 elif test -n "${SAMBA_VERSION_RC_RELEASE}";then
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}rc${SAMBA_VERSION_RC_RELEASE}"
     echo "#define SAMBA_VERSION_RC_RELEASE ${SAMBA_VERSION_RC_RELEASE}" >> $OUTPUT_FILE
-fi
-
-
-if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
+elif test -n "${SAMBA_VERSION_TP_RELEASE}";then
+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-tp${SAMBA_VERSION_TP_RELEASE}"
+    echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >> $OUTPUT_FILE
+elif test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
     _SAVE_LANG=${LANG}
     LANG=""
     HAVESVN=no