summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2019-02-20 13:48:33 +0100
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2019-02-20 16:48:49 +0100
commitcf7e6ba878a4a672c31661a27a1c57ef8f1494fd (patch)
tree6e11fbaf2f1b134421ea730454fd71d5d1f99365
parentf8d3457b76d518cc4c29573a2259ab6136f3c000 (diff)
mk_exim_release: include *full* version in docs
This matches the output from exim -bV
-rwxr-xr-xrelease-process/scripts/mk_exim_release21
1 files changed, 15 insertions, 6 deletions
diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release
index af41ead01..e4db70aee 100755
--- a/release-process/scripts/mk_exim_release
+++ b/release-process/scripts/mk_exim_release
@@ -87,6 +87,19 @@ package Context {
# rc|quick => RC4 | 27-gabcdef
# }
+ #
+ # v => {
+ # release => 4.92-RC4 | 4.92-27-gabcdef-dirty
+ # target_release|last_tag => 4.92 | 4.92
+ #
+ # major => 4
+ # minor => 92
+ # security =>
+ # fixes =>
+ #
+ # rc|quick => RC4 | 27-gabcdef-dirty
+ # }
+
if ($context->{quick}) {
# Try to find suitable version description
chomp(my $describe = do { # we wrap it into a open() to avoid hassle with
@@ -292,12 +305,8 @@ __
chdir $docdir or die "$ME: Can't chdir to $docdir: $!\n";
system('./OS-Fixups') == 0 or exit $?;
exec $context->{make_cmd},
- "EXIM_VER=$context->{v}{target_release}" .
- ($context->{v}{rc} ? "-$context->{v}{rc}"
- : $context->{v}{quick} ? "-$context->{v}{quick}"
- : ''),
- 'everything';
- die "$ME: [$cwd] Cannot exec $context->{make_cmd}: $!\n";
+ "EXIM_VER=$context->{v}{release}", 'everything'
+ or die "$ME: [$cwd] Cannot exec $context->{make_cmd}: $!\n";
}
else {
waitpid($pid, 0);