X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/ab1aa32a90edad1d06bf2daddcf21be53dd96a7a..e66a8a1aef8466d61991342335eb0802988c3f7e:/release-process/scripts/mk_exim_release?ds=sidebyside

diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release
index 5ed476365..a4111e566 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;
@@ -255,8 +256,8 @@ package Context {
 
             #my $stamp = $context->{minor} ? '_'.$context->{minor} : '';
             #$stamp .= $context->{rc} if $context->{rc};
-            my $release = $context->{v}{rc} ? $context->{v}{target_release}
-                                            : $context->{v}{last_tag};
+            my $release = $context->{quick} ? $context->{v}{last_tag}
+                                            : $context->{v}{target_release};
 
             my $variant =
                   $context->{v}{rc} ? $context->{v}{rc}
@@ -485,7 +486,7 @@ __
 
         # See also environment variables set in main, tuning compression levels
 
-        my (%size, %sha256);
+        my (%size, %sha256, %sha512);
 
         foreach my $dir ( glob( catdir( $pkg_trees, ( 'exim*-' . $context->{v}{release} ) ) ) ) {
             my $dirname = ( splitdir($dir) )[-1];
@@ -505,24 +506,30 @@ __
 
                 # calculate size and md5sum
                 $size{$basename} = -s $outfile;
-                $sha256{$basename} = do {
-                    my $sha = Digest::SHA->new(256);
-                    $sha->addfile($outfile);
-                    $sha->hexdigest;
-                };
+                $sha256{$basename} = Digest::SHA->new(256)->addfile($outfile)->hexdigest;
+                $sha512{$basename} = Digest::SHA->new(512)->addfile($outfile)->hexdigest;
             }
         }
 
         # write the sizes file
         if ($context->{sizes}) {
-            open my $sizes, '>', $_ = catfile $pkg_tars, 'sizes.txt'
-                or die "$ME: Can't open `$_': $!\n";
+            for ([ sizes => 'SIZE' => \%size ],
+                 [ sha256sums => 'SHA256' => \%sha256 ],
+                 [ sha512sums => 'SHA512' => \%sha512 ]) {
 
-            print $sizes join "\n",
-                (map { "SIZE($_) = $size{$_}" } sort keys %size),
-                (map { "SHA256($_) = $sha256{$_}" } sort keys %sha256);
+                my $outfile = catfile $pkg_tars, "00-$_->[0].txt";
+                my $tag = $_->[1];
+                my $sizes = $_->[2];
 
-            close($sizes) or die "$ME: Can't close $_: $!\n";
+                open my $out, '>', $outfile
+                    or die "$ME: Can't open `$outfile': $!\n";
+
+                print $out join "\n",
+                    (map { "$tag ($_) = $sizes->{$_}" } sort keys %$sizes),
+                    '';
+
+                close($out) or die "$ME: Can't close $outfile: $!\n";
+            }
         }
     }
 
@@ -535,6 +542,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
@@ -550,10 +568,10 @@ MAIN: {
         make_cmd    => 'make',  # for 'make'ing the docs
         sizes       => 1,
         compressors => {
-            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' },
+            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,
@@ -567,13 +585,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,
@@ -762,7 +773,7 @@ Write the sizes information to F<sizes.txt>. (default: write sizes)
 =item B<--tar-cmd> I<cmd>
 
 Use to override the path to the C<tar> command.  Need GNU tar in case
-I<lzip> is selected. (default: C<gtar>, if not found, use C<tar>)
+I<lzip> is selected. (default: C<gtar>, if not found, use C<tar>).
 
 =item B<--tmpdir> I<dir>