diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-08-31 01:52:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:16 -0500 |
| commit | b7eae7879411bbd4b62f6b93991cffe3c99ac5cd (patch) | |
| tree | 10025bf7f5def8f46b133c761c09b472312c5fec | |
| parent | e89be1bf44d7a1d3c7b8104747e2a35511cc2bce (diff) | |
| download | samba-b7eae7879411bbd4b62f6b93991cffe3c99ac5cd.tar.gz samba-b7eae7879411bbd4b62f6b93991cffe3c99ac5cd.tar.bz2 samba-b7eae7879411bbd4b62f6b93991cffe3c99ac5cd.zip | |
r24819: We are preparing for alpha1, so update the mkversion script to cope with that.
Andrew Bartlett
(This used to be commit 6245da195b76e233f83354797818f608c5458d63)
| -rw-r--r-- | source4/VERSION | 12 | ||||
| -rwxr-xr-x | source4/script/mkversion.sh | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/source4/VERSION b/source4/VERSION index 629838e695..d0f02a62f5 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -47,7 +47,17 @@ SAMBA_VERSION_REVISION= # 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 # diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh index bbc2745940..d29e8bcb94 100755 --- a/source4/script/mkversion.sh +++ b/source4/script/mkversion.sh @@ -20,6 +20,7 @@ SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION 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 @@ SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERS ## -## 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 @@ if test -n "${SAMBA_VERSION_REVISION}";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 -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}" |