summaryrefslogtreecommitdiffstats
path: root/source3/script
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-04-14 08:47:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:14 -0500
commitf8c418a0afba2aae6449e91ec83312cb92a46c34 (patch)
treef86a0daa2be0c9aa9f240a3dadf02199779a338a /source3/script
parent8e87cf8ad99d8e67620222959ce54f199b231025 (diff)
downloadsamba-f8c418a0afba2aae6449e91ec83312cb92a46c34.tar.gz
samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.tar.xz
samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.zip
r208: merge the version schema changes from 4_0
metze (This used to be commit 4d9d8e83aa367fe17a74b81d4417cc2cfbdf200e)
Diffstat (limited to 'source3/script')
-rwxr-xr-xsource3/script/mkversion.sh30
1 files changed, 11 insertions, 19 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index ca392979408..f3d385e27ef 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -24,13 +24,7 @@ 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_BETA_RELEASE=`sed -n 's/^SAMBA_VERSION_BETA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-
-SAMBA_VERSION_ALPHA_RELEASE=`sed -n 's/^SAMBA_VERSION_ALPHA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-
-SAMBA_VERSION_TEST_RELEASE=`sed -n 's/^SAMBA_VERSION_TEST_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-
-SAMBA_VERSION_IS_CVS_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_CVS_SNAPSHOT=//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`
@@ -53,21 +47,19 @@ 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
-elif test -n "${SAMBA_VERSION_BETA_RELEASE}";then
- SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}beta${SAMBA_VERSION_BETA_RELEASE}"
- echo "#define SAMBA_VERSION_BETA_RELEASE ${SAMBA_VERSION_BETA_RELEASE}" >> $OUTPUT_FILE
-elif test -n "${SAMBA_VERSION_ALPHA_RELEASE}";then
- SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}alpha${SAMBA_VERSION_ALPHA_RELEASE}"
- echo "#define SAMBA_VERSION_ALPHA_RELEASE ${SAMBA_VERSION_ALPHA_RELEASE}" >> $OUTPUT_FILE
-elif test -n "${SAMBA_VERSION_TEST_RELEASE}";then
- SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}test${SAMBA_VERSION_TEST_RELEASE}"
- echo "#define SAMBA_VERSION_TEST_RELEASE ${SAMBA_VERSION_TEST_RELEASE}" >> $OUTPUT_FILE
fi
-if test x"${SAMBA_VERSION_IS_CVS_SNAPSHOT}" = x"yes";then
- SAMBA_VERSION_STRING="CVS ${SAMBA_VERSION_STRING}"
- echo "#define SAMBA_VERSION_IS_CVS_SNAPSHOT 1" >> $OUTPUT_FILE
+if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
+ TMP_SVN_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
+ TMP_SVN_REVISION_STR=""
+ if test -n "${TMP_SVN_REVISION}";then
+ TMP_SVN_REVISION_STR="-${TMP_SVN_REVISION}"
+ else
+ TMP_SVN_REVISION=0
+ fi
+ SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build${TMP_SVN_REVISION_STR}"
+ echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_SVN_REVISION}" >> $OUTPUT_FILE
fi
if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then