r205: update to the new version schema

in a svn or svk working copy (checked out tree)
we now have "3.9.0-SVN-build-205" versions
for the SAMBA_4_0 branch

when I put out the 3.9.0 release
it will change to 3.9.1-SVN-build-XXX

I will merge this to SAMBA_3_0 and trunk soon

metze

diff --git a/source/VERSION b/source/VERSION
index 91c1f98b38109401f71897a960976efe9ebdb8a0..cdc04ab5af9842d30ec0174472670be6a5ec79e8 100644 (file)
--- a/source/VERSION
+++ b/source/VERSION
@@ -17,8 +17,8 @@
 #      SAMBA_VERSION_RELEASE=0                         #
 #  ->  "3.0.0"                                         #
 ########################################################
-SAMBA_VERSION_MAJOR=4
-SAMBA_VERSION_MINOR=0
+SAMBA_VERSION_MAJOR=3
+SAMBA_VERSION_MINOR=9
 SAMBA_VERSION_RELEASE=0
 
 ########################################################
@@ -54,46 +54,16 @@ SAMBA_VERSION_PRE_RELEASE=
 SAMBA_VERSION_RC_RELEASE=
 
 ########################################################
-# For 'beta' releases the version will be              #
-#                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>beta<BETA_RELEASE>          #
-#                                                      #
-# e.g. SAMBA_VERSION_BETA_RELEASE=3                    #
-#  ->  "3.0.0beta3"                                    #
-########################################################
-SAMBA_VERSION_BETA_RELEASE=
-
-########################################################
-# For 'alpha' releases the version will be             #
-#                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>alpha<ALPHA_RELEASE>        #
-#                                                      #
-# e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
-#  ->  "4.0.0alpha1"                                   #
-########################################################
-SAMBA_VERSION_ALPHA_RELEASE=
-
-########################################################
-# For 'test' releases the version will be              #
-#                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>test<TEST_RELEASE>          #
-#                                                      #
-# e.g. SAMBA_VERSION_TEST_RELEASE=1                    #
-#  ->  "4.0.0test1"                                    #
-########################################################
-SAMBA_VERSION_TEST_RELEASE=1
-
-########################################################
-# To mark CVS snapshots this should be set to 'yes'    #
+# To mark SVN snapshots this should be set to 'yes'    #
 # in the development BRANCH, and set to 'no' only in   #
 # the SAMBA_X_X_RELEASE BRANCH                         #
 #                                                      #
 # <MAJOR>.<MINOR>.<RELEASE>[...]cvs                    #
 #                                                      #
-# e.g. SAMBA_VERSION_IS_CVS_SNAPSHOT=yes               #
-#  ->  "CVS 3.0.0rc2"                                  #
+# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
+#  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_IS_CVS_SNAPSHOT=yes
+SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
 
 ########################################################
 # This can be set by vendors if they want...           #

diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index ca392979408787827f804d810b319e15913fe47d..f3d385e27efd82a29761b042ce827d228f6684b3 100755 (executable)
--- a/source/script/mkversion.sh
+++ b/source/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