X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cbae9e740c7aea5b544e3cfc64af31820699f200..e5903596a0:/release-process/scripts/mk_exim_release diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release index 84d26e777..5ed476365 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); @@ -475,28 +484,22 @@ __ ) if qx/tar --help 2>&1/ =~ /^\s*--owner=/m; # See also environment variables set in main, tuning compression levels - my %COMPRESSION = ( - gzip => { extension => 'gz', flags => '--gzip' }, - bzip2 => { extension => 'bz2', flags => '--bzip2' }, - lzip => { extension => 'lz', flags => '--lzip' }, - xz => { extension => 'xz', flags => '--xz' }, - ); - my (%size, %sha256); foreach my $dir ( glob( catdir( $pkg_trees, ( 'exim*-' . $context->{v}{release} ) ) ) ) { my $dirname = ( splitdir($dir) )[-1]; - foreach my $comp (keys %COMPRESSION) { - next unless $context->{compressors}{$comp}; + foreach my $comp (keys %{$context->{compressors}}) { + my %compressor = %{$context->{compressors}{$comp}}; + next unless $compressor{use}; - my $basename = "$dirname.tar.$COMPRESSION{$comp}{extension}"; + my $basename = "$dirname.tar.$compressor{extension}"; my $outfile = catfile $pkg_tars, $basename; print "Creating: $outfile\n" if $verbose || $debug; 0 == system($tar, cf => $outfile, - $COMPRESSION{$comp}{flags}, + $compressor{flags}, @ownership, -C => $pkg_trees, $dirname) or exit $? >> 8; @@ -545,11 +548,12 @@ MAIN: { group => '0', }, make_cmd => 'make', # for 'make'ing the docs + sizes => 1, compressors => { - gzip => 1, - bzip2 => 1, - xz => 1, - lzip => 0, + gzip => { use => 1, extension => 'gz', flags => '--gzip' }, + bzip2 => { use => 1, extension => 'bz2', flags => '--bzip2' }, + xz => { use => 1, extension => 'xz', flags => '--xz' }, + lzip => { use => 0, extension => 'lz', flags => '--lzip' }, }, docs => 1, web => 1, @@ -574,12 +578,25 @@ MAIN: { GetOptions( $context, qw(workspace|tmp=s website_base|webgen_base=s tar_cmd|tar-cmd=s make_cmd|make-cmd=s - docs|build-docs! web|build-web! + docs|build-docs! web|build-web! sizes! delete! cleanup! quick|quick-release! minimal), 'sign!' => \$context->{gpg}{sign}, 'key=s' => \$context->{gpg}{key}, - 'lzip!' => \$context->{compressors}{lzip}, 'verbose!' => \$verbose, + 'compressors=s@' => sub { + die "$0: can't parse compressors string `$_[1]'\n" unless $_[1] =~ /^[+=-]?\w+(?:[+=-]\w+)*$/; + while ($_[1] =~ /(?[+=-])?(?\w+)\b/g) { + die "$0: Unknown compressor $+{name}" + unless $context->{compressors}{$+{name}}; + if (not defined $+{act} or $+{act} eq '=') { + $_->{use} = 0 + for values %{$context->{compressors}}; + $context->{compressors}{$+{name}}{use}++; + } + elsif ($+{act} eq '+') { $context->{compressors}{$+{name}}{use}++; } + elsif ($+{act} eq '-') { $context->{compressors}{$+{name}}{use}--; } + } + }, 'debug:s' => \$debug, 'quick' => sub { $context->{web}--; $context->{quick} = 1 }, 'help|?' => sub { pod2usage(-verbose => 1, -exit => 0) }, @@ -673,6 +690,13 @@ Call B about like this: Do (or do not) cleanup the tmp directory at exit (default: do cleanup) +=item B<--compressors> [I]I$]... + +A list of compressors to use. Currently the default list is +B, B, and B, with B optionally to be enabled. + +I can be "+" (add), "-" (remove), and "=" (set). + =item B<--debug[=I]> Forces debug mode. If (default: no debug info) @@ -712,10 +736,6 @@ is used: =back -=item B<--[no]lzip> - -Control the creation of B tarballs. (default: do not use lzip) - =item B<--make-cmd> I Force the use of a specific C command. This may be necessary if C is not @@ -735,6 +755,10 @@ website creation (which can be enabled by B<--web> again). Sign the created archive files (and the sizes.txt). (default: sign) +=item B<--[no]sizes> + +Write the sizes information to F. (default: write sizes) + =item B<--tar-cmd> I Use to override the path to the C command. Need GNU tar in case