summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-23 04:52:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:22 -0500
commit541d84f934dfd1a92fcd1551a8b86550e8e4c1c0 (patch)
tree0b0ebb077a49c6a0d3a14d0c6429415524253309
parent82b6a5c9fcae38353bf24b0d9372f24c3c387924 (diff)
downloadsamba-541d84f934dfd1a92fcd1551a8b86550e8e4c1c0.tar.gz
samba-541d84f934dfd1a92fcd1551a8b86550e8e4c1c0.tar.bz2
samba-541d84f934dfd1a92fcd1551a8b86550e8e4c1c0.zip
r13077: Allow the mkversion script to be used for technology preview releases
(This used to be commit 2636e6c948c850e61debf75ff63b5d02f537e917)
-rwxr-xr-xsource4/script/mkversion.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 9d919cfe34..8e5fea5c8b 100755
--- 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