X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6e73859a6adb406fabe713558d8d22691d6354c8..13912bf2bc166b324a73b4b5089defa5bb698ae6:/src/scripts/reversion?ds=sidebyside diff --git a/src/scripts/reversion b/src/scripts/reversion index c82d9c0ac..3657cfcba 100755 --- a/src/scripts/reversion +++ b/src/scripts/reversion @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) The Exim Maintainers 2017 +# Copyright (c) The Exim Maintainers 1995 - 2018 set -e LC_ALL=C @@ -29,43 +29,41 @@ fi # Read version information that was generated by a previous run of # this script, or during the release process. -if [ -f ./version.sh ] -then . ./version.sh -elif [ -f ../src/version.sh ] -then . ../src/version.sh -fi - -# If this tree is a git working directory, use that to get version information. - -if [ -d ../../.git ] || [ "$1" = "release" ] -then - # Modify the output of git describe into separate parts for - # the name "exim" and the release and variant versions. - # Put a dot in the version number and remove a spurious g. - if [ "$2" ] - then - description=$(git describe "$2") - else - description=$(git describe --dirty=-XX --match 'exim-4*') - fi - set $(echo "$description" | sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|') - # Only update if we need to - if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ] - then - EXIM_RELEASE_VERSION="$2" - EXIM_VARIANT_VERSION="$3" - rm -f version.h - fi +if [ -f ./version.sh ]; then + . ./version.sh +elif [ -f ../src/version.sh ]; then + . ../src/version.sh +elif [ -d ../../.git ] || [ -f ../../.git ] || [ "$1" = release ]; then + # Modify the output of git describe into separate parts for + # the name "exim" and the release and variant versions. + # Put a dot in the version number and remove a spurious g. + if [ "$2" ] + then + description=$(git describe "$2") + else + description=$(git describe --dirty=-XX --match 'exim-4*') + fi + set $(echo "$description" | sed 's/-/ /; s/-g/-/') + # Only update if we need to + if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ] + then + EXIM_RELEASE_VERSION="$2" + EXIM_VARIANT_VERSION="$3" + rm -f version.h + fi +else + echo "Cannot determine the release number" >&2 + exit fi # If you are maintaining a patched version of Exim, you can either # create your own version.sh as part of your release process, or you # can modify EXIM_VARIANT_VERSION at this point in this script. -case "$EXIM_RELEASE_VERSION" in -'') echo "*** Your copy of Exim lacks any version information." - exit 1 -esac +if test -z "$EXIM_RELEASE_VERSION"; then + echo "$0: Your copy of Exim lacks any version information." >&2 + exit 1 +fi EXIM_COMPILE_NUMBER=$(expr "${EXIM_COMPILE_NUMBER:-0}" + 1) @@ -101,6 +99,7 @@ fi ( echo '# automatically generated file - see ../scripts/reversion' echo EXIM_RELEASE_VERSION='"'"$EXIM_RELEASE_VERSION"'"' + test -n "$EXIM_VARIANT_VERSION" && \ echo EXIM_VARIANT_VERSION='"'"$EXIM_VARIANT_VERSION"'"' echo EXIM_COMPILE_NUMBER='"'"$EXIM_COMPILE_NUMBER"'"' if [ ".${exim_build_date_override:-}" != "." ]; then @@ -112,13 +111,18 @@ if [ ! -f version.h ] then ( echo '/* automatically generated file - see ../scripts/reversion */' echo '#define EXIM_RELEASE_VERSION "'"$EXIM_RELEASE_VERSION"'"' + test -n "$EXIM_VARIANT_VERSION" && \ echo '#define EXIM_VARIANT_VERSION "'"$EXIM_VARIANT_VERSION"'"' - echo '#define EXIM_VERSION_STR EXIM_RELEASE_VERSION EXIM_VARIANT_VERSION' + echo '#ifdef EXIM_VARIANT_VERSION' + echo '#define EXIM_VERSION_STR EXIM_RELEASE_VERSION "-" EXIM_VARIANT_VERSION' + echo '#else' + echo '#define EXIM_VERSION_STR EXIM_RELEASE_VERSION' + echo '#endif' if [ ".${exim_build_date_override:-}" != "." ]; then echo '#define EXIM_BUILD_DATE_OVERRIDE "'"${exim_build_date_override}"'"' fi ) >version.h fi -echo ">>> version $EXIM_RELEASE_VERSION$EXIM_VARIANT_VERSION #$EXIM_COMPILE_NUMBER" +echo ">>> version $EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION #$EXIM_COMPILE_NUMBER" echo