Commit 65d9febf authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Gerald (Jerry) Carter
Browse files

r413: merge from 4_0: 

as we decide to not do 3.0.2a releases anymore,
remove the generation stuff from VERSION and mkversion.sh

metze
(This used to be commit 25cbca89baa89327384e80ad5f71577c3db6d6a2)
parent 9b4e6c7e

source3/VERSION

+0 −12
Original line number Diff line number Diff line
@@ -21,18 +21,6 @@ SAMBA_VERSION_MAJOR=3 
SAMBA_VERSION_MINOR=0

SAMBA_VERSION_RELEASE=4



########################################################

# If a official release has a serious bug              #

# a security release will have 'a' sufffix             #

#                                                      #

# so SAMBA's version will be                           #

# <MAJOR>.<MINOR>.<RELEASE><REVISION>                  #

#                                                      #

# e.g. SAMBA_VERSION_PRE_RELEASE=a                     #

#  ->  "2.2.8a"                                        #

########################################################

SAMBA_VERSION_REVISION=



########################################################

# For 'pre' releases the version will be               #

#                                                      #

source3/script/mkversion.sh

+1 −6
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FIL 
SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`

SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`



SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//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`
@@ -38,10 +36,7 @@ echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE 
SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"





if test -n "${SAMBA_VERSION_REVISION}";then

    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"

    echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >> $OUTPUT_FILE

elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then

if test -n "${SAMBA_VERSION_PRE_RELEASE}";then

    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"

    echo "#define SAMBA_VERSION_PRE_RELEASE ${SAMBA_VERSION_PRE_RELEASE}" >> $OUTPUT_FILE

elif test -n "${SAMBA_VERSION_RC_RELEASE}";then