Merge tag 'exim-4_82_1'

[exim.git] / release-process / scripts / mk_exim_release.pl

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index 395cdd2b0eae6043dd3aa0d6ff603d83c3ce0577..e3267fd3e80efb5f5ecf8e68252681a1dbac557e 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -149,7 +149,8 @@ sub build_html_documentation {
     my @cmd = (
         $genpath,   '--spec',    $spec,                '--filter',
         $filter,    '--latest',  $context->{trelease}, '--tmpl',
     my @cmd = (
         $genpath,   '--spec',    $spec,                '--filter',
         $filter,    '--latest',  $context->{trelease}, '--tmpl',

-        $templates, '--docroot', $dir,                 '--localstatic'
+        $templates, '--docroot', $dir,                 '--localstatic',
+        (($verbose||$debug) ? '--verbose' : '')

     );
 
     print "Executing ", join( ' ', @cmd ), "\n";
     );
 
     print "Executing ", join( ' ', @cmd ), "\n";


@@ -334,15 +335,15 @@ sub create_tar_files {
     foreach my $dir ( glob( File::Spec->catdir( $pkgdirs, ( 'exim*-' . $context->{release} ) ) ) ) {
         my $dirname = ( File::Spec->splitdir($dir) )[-1];
         if ($context->{compressors}{gzip}) {
     foreach my $dir ( glob( File::Spec->catdir( $pkgdirs, ( 'exim*-' . $context->{release} ) ) ) ) {
         my $dirname = ( File::Spec->splitdir($dir) )[-1];
         if ($context->{compressors}{gzip}) {

-            print "Creating: ${pkgs}/${dirname}.tar.gz\n" if ($verbose);
+            print "Creating: ${pkgs}/${dirname}.tar.gz\n" if ($verbose || $debug);

             system("$tar cf  ${pkgs}/${dirname}.tar.gz  --gzip  -C ${pkgdirs} ${dirname}")
         }
         if ($context->{compressors}{bzip2}) {
             system("$tar cf  ${pkgs}/${dirname}.tar.gz  --gzip  -C ${pkgdirs} ${dirname}")
         }
         if ($context->{compressors}{bzip2}) {

-            print "Creating: ${pkgs}/${dirname}.tar.bz2\n" if ($verbose);
+            print "Creating: ${pkgs}/${dirname}.tar.bz2\n" if ($verbose || $debug);

             system("$tar cf  ${pkgs}/${dirname}.tar.bz2 --bzip2 -C ${pkgdirs} ${dirname}")
         }
         if ($context->{compressors}{lzip}) {
             system("$tar cf  ${pkgs}/${dirname}.tar.bz2 --bzip2 -C ${pkgdirs} ${dirname}")
         }
         if ($context->{compressors}{lzip}) {

-            print "Creating: ${pkgs}/${dirname}.tar.lz\n" if ($verbose);
+            print "Creating: ${pkgs}/${dirname}.tar.lz\n" if ($verbose || $debug);

             system("$tar cf  ${pkgs}/${dirname}.tar.lz  --lzip  -C ${pkgdirs} ${dirname}")
         }
     }
             system("$tar cf  ${pkgs}/${dirname}.tar.lz  --lzip  -C ${pkgdirs} ${dirname}")
         }
     }