Ignore:
Timestamp:
Nov 26, 2007, 9:24:27 AM (18 years ago)
Author:
Paul Smedley
Message:

Update source to 3.0.27a

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/samba-3.0/source/script/mkversion.sh

    r62 r105  
    1717SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
    1818SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
     19
    1920SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE`
     21
     22SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
    2023SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
    2124SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
    22 SAMBA_VERSION_IS_SVN_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_SVN_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE`
     25
     26SAMBA_VERSION_IS_GIT_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_GIT_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE`
     27
     28SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p' $SOURCE_DIR$VERSION_FILE`
     29
    2330SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE`
    24 SAMBA_VENDOR_PATCH=`sed -n 's/^SAMBA_VENDOR_PATCH=//p' $SOURCE_DIR$VERSION_FILE`
     31SAMBA_VERSION_VENDOR_PATCH=`sed -n 's/^SAMBA_VERSION_VENDOR_PATCH=//p' $SOURCE_DIR$VERSION_FILE`
    2532
    2633echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE
    … …  
    3845
    3946##
    40 ## maybe add "3.0.22a" or "3.0.22pre1" or "3.0.22rc1"
     47## maybe add "3.0.22a" or "4.0.0tp11" or "3.0.22pre1" or "3.0.22rc1"
    4148## We do not do pre or rc version on patch/letter releases
    4249##
    … …  
    4451    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
    4552    echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >> $OUTPUT_FILE
     53elif test -n "${SAMBA_VERSION_TP_RELEASE}";then
     54    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}tp${SAMBA_VERSION_TP_RELEASE}"
     55    echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >> $OUTPUT_FILE
    4656elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
    4757    ## maybe add "3.0.22pre2"
    … …  
    5464
    5565##
    56 ## Add the vendor string if present
     66## GIT commit details
    5767##
    58 if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
    59     echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE
    60     if test -n "${SAMBA_VENDOR_PATCH}";then
    61         echo "#define SAMBA_VENDOR_PATCH ${SAMBA_VENDOR_PATCH}" >> $OUTPUT_FILE
    62     fi
    63 fi
     68if test x"${SAMBA_VERSION_IS_GIT_SNAPSHOT}" = x"yes";then
     69    _SAVE_LANG=${LANG}
     70    LANG="C"
     71    HAVEVER="no"
    6472
    65 
    66 
    67 ##
    68 ## SVN revision number?
    69 ##
    70 if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
    71     _SAVE_LANG=${LANG}
    72     LANG=""
    73     HAVESVN=no
    74     svn info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVN=yes
    75     TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep 'Last Changed Rev.*:' |sed -e 's/Last Changed Rev.*: \([0-9]*\).*/\1/'`
    76     if test x"${HAVESVN}" = x"no";then
    77         HAVESVK=no
    78         svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes
    79         TMP_MIRRORED_REVISION=`(svk info ${SOURCE_DIR} 2>/dev/null) |grep 'Mirrored From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..* \([0-9]*\).*/\1/'`
    80         if test -n "$TMP_MIRRORED_REVISION"; then
    81             TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}-[SVN-${TMP_MIRRORED_REVISION}]"
    82         else
    83             TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
     73    if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.git";then
     74        HAVEGIT=no
     75        GIT_INFO=`git show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD 2>/dev/null`
     76        GIT_COMMIT_ABBREV=`echo -e "${GIT_INFO}" | sed -n 1p`
     77        GIT_COMMIT_TIME=`echo -e "${GIT_INFO}" | sed -n 2p`
     78        GIT_COMMIT_FULLREV=`echo -e "${GIT_INFO}" | sed -n 3p`
     79        GIT_COMMIT_DATE=`echo -e "${GIT_INFO}" | sed -n 4p`
     80        if test -n "${GIT_COMMIT_ABBREV}";then
     81            HAVEGIT=yes
     82            HAVEVER=yes
    8483        fi
    8584    fi
    8685
    87     if test x"${HAVESVN}" = x"yes";then
    88             SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-${TMP_REVISION}"
    89             echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}" >> $OUTPUT_FILE
    90     elif test x"${HAVESVK}" = x"yes";then
    91             SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}"
     86    if test x"${HAVEGIT}" = x"yes";then
     87        SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-GIT-${GIT_COMMIT_ABBREV}"
     88
     89        echo "#define SAMBA_VERSION_GIT_COMMIT_ABBREV \"${GIT_COMMIT_ABBREV}\"" >> $OUTPUT_FILE
     90        echo "#define SAMBA_VERSION_GIT_COMMIT_TIME ${GIT_COMMIT_TIME}" >> $OUTPUT_FILE
     91        echo "#define SAMBA_VERSION_GIT_COMMIT_FULLREV \"${GIT_COMMIT_FULLREV}\"" >> $OUTPUT_FILE
     92        echo "#define SAMBA_VERSION_GIT_COMMIT_DATE \"${GIT_COMMIT_DATE}\"" >> $OUTPUT_FILE
    9293    else
    93             SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build-UNKNOWN"
     94        SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-GIT-UNKNOWN"
    9495    fi
    9596    LANG=${_SAVE_LANG}
    … …  
    9899echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUTPUT_FILE
    99100
     101##
     102## Add the vendor string if present
     103##
     104if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
     105    echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE
     106    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}"
     107    if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then
     108        echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE
     109        SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}"
     110    fi
     111fi
     112
     113##
     114## Add a release nickname
     115##
     116if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
     117    echo "#define SAMBA_VERSION_RELEASE_NICKNAME ${SAMBA_VERSION_RELEASE_NICKNAME}" >> $OUTPUT_FILE
     118    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING} (${SAMBA_VERSION_RELEASE_NICKNAME})"
     119fi
     120
    100121echo "#define SAMBA_VERSION_STRING samba_version_string()" >> $OUTPUT_FILE
    101122
    102 echo "$0: 'include/version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
    103 
    104 if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
    105     echo -n "$0: with VENDOR_SUFFIX = \""
    106     echo -n ${SAMBA_VERSION_VENDOR_SUFFIX} | sed 's/"//g'
    107     if test -n "${SAMBA_VENDOR_PATCH}"; then
    108        echo -n "-${SAMBA_VENDOR_PATCH}"
    109    fi
    110    echo "\""
    111 fi
     123echo "$0: '$OUTPUT_FILE' created for Samba(\"${SAMBA_VERSION_STRING}\")"
    112124
    113125exit 0
Note: See TracChangeset for help on using the changeset viewer.