X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/9d0311ffda3349b05b57802e2031c6dc94bc20ae..6e44a10a3f29908c3d5d77eb2e288b7ce8e3a61a:/release-process/scripts/mk_exim_release.pl?ds=sidebyside

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index 46d63e516..e3267fd3e 100755
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -146,8 +146,12 @@ sub build_html_documentation {
 
     mkdir($dir);
 
-    my @cmd =
-      ( $genpath, '--spec', $spec, '--filter', $filter, '--latest', $context->{trelease}, '--tmpl', $templates, '--docroot', $dir );
+    my @cmd = (
+        $genpath,   '--spec',    $spec,                '--filter',
+        $filter,    '--latest',  $context->{trelease}, '--tmpl',
+        $templates, '--docroot', $dir,                 '--localstatic',
+        (($verbose||$debug) ? '--verbose' : '')
+    );
 
     print "Executing ", join( ' ', @cmd ), "\n";
     system(@cmd);
@@ -188,7 +192,8 @@ sub build_documentation {
     my $context = shift;
 
     my $docdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-docbook' );
-    system("cd '$docdir' && ./OS-Fixups && make everything") == 0
+    # documentation building gets the truncated release, without RC
+    system("cd '$docdir' && ./OS-Fixups && make EXIM_VER=$context->{trelease} everything") == 0
       || croak "Doc build failed";
 
     copy_docbook_files($context);
@@ -330,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}) {
-            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}) {
-            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}) {
-            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}")
         }
     }
@@ -357,7 +362,7 @@ sub create_tar_files {
         compressors => {
                 gzip    => 1,
                 bzip2   => 1,
-                lzip    => 1,
+                lzip    => 0,
         },
     };
     my $delete;
@@ -435,9 +440,9 @@ Use to override the path to the tar command; without this, will search for
 gtar, and if not found use tar.  Need GNU tar for lzip, unless --no-lzip is
 used.
 
-=item B<--no-lzip>
+=item B<--lzip>
 
-Do not build the lzip tarballs.
+Build the lzip tarballs.
 
 =item B<--verbose>