X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=release-process%2Fscripts%2Fmk_exim_release;h=e3675327f4414b224b4bcd82eaa6bf91618e53ba;hb=94ef322eb8618c2c4448090146faab976d43e923;hp=e4db70aeeb26649ed14de7e66be082fe618d53b8;hpb=cf7e6ba878a4a672c31661a27a1c57ef8f1494fd;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release index e4db70aee..e3675327f 100755 --- a/release-process/scripts/mk_exim_release +++ b/release-process/scripts/mk_exim_release @@ -12,6 +12,7 @@ use Getopt::Long; use IO::File; use Pod::Usage; use Digest::SHA; +use feature 'state'; use if $ENV{DEBUG} => 'Smart::Comments'; my $ME = basename $0; @@ -484,28 +485,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; @@ -541,6 +536,17 @@ __ } +# Check, if tar understands --use-compress-program and use this, as +# at least gzip deprecated passing options via the environment. +sub compressor { + my ($compressor, $fallback) = @_; + state $use_compress_option = + 0 == system("tar c -f /dev/null -C / --use-compress-program=cat dev/null 2>/dev/null"); + return $use_compress_option + ? "--use-compress-program=$compressor" + : ref $fallback eq ref sub {} ? $fallback->() : $fallback; +} + MAIN: { # some of these settings are useful only if we're in the @@ -556,10 +562,10 @@ MAIN: { 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 => compressor('gzip -9', sub { $ENV{GZIP} = '-9'; '--gzip' }) }, + bzip2 => { use => 1, extension => 'bz2', flags => compressor('bzip2 -9', sub { $ENV{BZIP2} = '-9'; '--bzip2' }) }, + xz => { use => 1, extension => 'xz', flags => compressor('xz -9', sub { $ENV{XZ_OPT} = '-9'; '--xz' }) }, + lzip => { use => 0, extension => 'lz', flags => compressor('lzip -9', '--lzip') }, }, docs => 1, web => 1, @@ -573,13 +579,6 @@ MAIN: { ); ##$ENV{'PATH'} = '/opt/local/bin:' . $ENV{'PATH'}; - # We are creating files for mass distribution, so work harder to make smaller files. - $ENV{GZIP} = -9; - $ENV{BZIP2} = -9; - # xz documents minimum file sizes for levels higher than -6 to be useful and each - # requires more RAM on the decompressing system. Exim tarball currently 24MiB so - # using -8. - $ENV{XZ_DEFAULTS} = -8; GetOptions( $context, @@ -588,8 +587,21 @@ MAIN: { 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) }, @@ -683,6 +695,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) @@ -722,10 +741,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 @@ -752,7 +767,7 @@ 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 -I is selected. (default: C, if not found, use C) +I is selected. (default: C, if not found, use C). =item B<--tmpdir> I