diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2018-02-06 00:13:40 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2018-12-13 23:11:36 +0100 |
| commit | 525c441c8defd07ec9c1c235eb8ac4da304d70be (patch) | |
| tree | 8e944b01bb2560299ec6dc99f8a67bd5dd596e1e /src/scripts | |
| parent | 9d727701a16bf4a93b136fe01e1bf2e5996c96ee (diff) | |
| download | exim4-525c441c8defd07ec9c1c235eb8ac4da304d70be.tar.gz | |
mk_exim_release: rework for dotted release scheme
Diffstat (limited to 'src/scripts')
| -rwxr-xr-x | src/scripts/reversion | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/scripts/reversion b/src/scripts/reversion index 2d63ad746..3657cfcba 100755 --- a/src/scripts/reversion +++ b/src/scripts/reversion @@ -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,8 +111,13 @@ 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 |