X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d50a8be23a0e941161b1abeee78ebb5d2304d15b..bf24ce50fb71af514759f32ed05d1634626962fd:/src/scripts/reversion diff --git a/src/scripts/reversion b/src/scripts/reversion index 63b4adbfe..6854112d7 100755 --- a/src/scripts/reversion +++ b/src/scripts/reversion @@ -29,7 +29,6 @@ fi # Read version information that was generated by a previous run of # this script, or during the release process. - set $(echo "$description" | sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|') if [ -f ./version.sh ]; then . ./version.sh elif [ -f ../src/version.sh ]; then @@ -44,6 +43,7 @@ elif [ -d ../../.git ] || [ -f ../../.git ] || [ "$1" = release ]; then 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 @@ -99,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 @@ -110,13 +111,17 @@ 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 +#test -t 1 && echo ">>> version $EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION #$EXIM_COMPILE_NUMBER"