Author: abartlet Date: 2007-08-31 01:52:37 +0000 (Fri, 31 Aug 2007) New Revision: 24819
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24819 Log: We are preparing for alpha1, so update the mkversion script to cope with that. Andrew Bartlett Modified: branches/SAMBA_4_0/source/VERSION branches/SAMBA_4_0/source/script/mkversion.sh Changeset: Modified: branches/SAMBA_4_0/source/VERSION =================================================================== --- branches/SAMBA_4_0/source/VERSION 2007-08-31 01:31:39 UTC (rev 24818) +++ branches/SAMBA_4_0/source/VERSION 2007-08-31 01:52:37 UTC (rev 24819) @@ -47,9 +47,19 @@ # e.g. SAMBA_VERSION_TP_RELEASE=1 # # -> "4.0.0tp1" # ######################################################## -SAMBA_VERSION_TP_RELEASE=6 +SAMBA_VERSION_TP_RELEASE= ######################################################## +# For 'alpha' releases the version will be # +# # +# <MAJOR>.<MINOR>.<RELEASE>alpha<TP_RELEASE> # +# # +# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # +# -> "4.0.0alpha1" # +######################################################## +SAMBA_VERSION_ALPHA_RELEASE=1 + +######################################################## # For 'pre' releases the version will be # # # # <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE> # Modified: branches/SAMBA_4_0/source/script/mkversion.sh =================================================================== --- branches/SAMBA_4_0/source/script/mkversion.sh 2007-08-31 01:31:39 UTC (rev 24818) +++ branches/SAMBA_4_0/source/script/mkversion.sh 2007-08-31 01:52:37 UTC (rev 24819) @@ -20,6 +20,7 @@ SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE` SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` +SAMBA_VERSION_ALPHA_RELEASE=`sed -n 's/^SAMBA_VERSION_ALPHA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` @@ -44,7 +45,7 @@ ## -## maybe add "3.0.22a" or "4.0.0tp11" or "3.0.22pre1" or "3.0.22rc1" +## maybe add "3.0.22a" or "4.0.0tp11" or "4.0.0alpha1" or "3.0.22pre1" or "3.0.22rc1" ## We do not do pre or rc version on patch/letter releases ## if test -n "${SAMBA_VERSION_REVISION}";then @@ -53,6 +54,9 @@ 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 -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_PRE_RELEASE}";then ## maybe add "3.0.22pre2" SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"