X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/5901f0abfe16545a81e820cd9816e830287776a7..9d6bb16d6af8c4d2c5e2f58d2a6983c03600c35a:/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 4bad07ab2..d29770d27 100755
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -111,8 +111,6 @@ sub unpack_tree {
 sub make_version_script {
     my $context = shift;
 
-    return if ($context->{release} eq $context->{trelease});
-
     my $variant = substr( $context->{release}, length($context->{trelease}) );
     if ( $context->{release} ne $context->{trelease} . $variant ) {
         die "Broken version numbering, I'm buggy";
@@ -148,8 +146,11 @@ 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'
+    );
 
     print "Executing ", join( ' ', @cmd ), "\n";
     system(@cmd);
@@ -190,7 +191,7 @@ 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
+    system("cd '$docdir' && ./OS-Fixups && make EXIM_VER=$context->{release} everything") == 0
       || croak "Doc build failed";
 
     copy_docbook_files($context);
@@ -297,15 +298,52 @@ sub do_cleanup {
 
 # ------------------------------------------------------------------
 
+# We prefer gtar to tar if gtar exists in $PATH
+
+sub fix_paths_tar {
+    my $context = shift;
+    my $tar = $context->{tar_cmd};
+
+    return unless $tar eq 'tar';
+
+    foreach my $d (File::Spec->path()) {
+        my $p = File::Spec->catfile($d, 'gtar');
+        if (-x $p) {
+            $context->{tar_cmd} = $p;
+            print "Switched tar command to: $p\n" if ($verbose);
+            return;
+        }
+    }
+}
+
+# ------------------------------------------------------------------
+
 sub create_tar_files {
     my $context = shift;
 
     my $pkgs    = $context->{pkgs};
     my $pkgdirs = $context->{pkgdirs};
+    my $tar     = $context->{tar_cmd};
+    if ($verbose) {
+        foreach my $c (keys %{ $context->{compressors} }) {
+            print "Compression: $c\t$context->{compressors}{$c}\n";
+        }
+    }
+
     foreach my $dir ( glob( File::Spec->catdir( $pkgdirs, ( 'exim*-' . $context->{release} ) ) ) ) {
         my $dirname = ( File::Spec->splitdir($dir) )[-1];
-        system("tar cfz ${pkgs}/${dirname}.tar.gz  -C ${pkgdirs} ${dirname}");
-        system("tar cfj ${pkgs}/${dirname}.tar.bz2 -C ${pkgdirs} ${dirname}");
+        if ($context->{compressors}{gzip}) {
+            print "Creating: ${pkgs}/${dirname}.tar.gz\n" if ($verbose);
+            system("$tar cf  ${pkgs}/${dirname}.tar.gz  --gzip  -C ${pkgdirs} ${dirname}")
+        }
+        if ($context->{compressors}{bzip2}) {
+            print "Creating: ${pkgs}/${dirname}.tar.bz2\n" if ($verbose);
+            system("$tar cf  ${pkgs}/${dirname}.tar.bz2 --bzip2 -C ${pkgdirs} ${dirname}")
+        }
+        if ($context->{compressors}{lzip}) {
+            print "Creating: ${pkgs}/${dirname}.tar.lz\n" if ($verbose);
+            system("$tar cf  ${pkgs}/${dirname}.tar.lz  --lzip  -C ${pkgdirs} ${dirname}")
+        }
     }
 }
 
@@ -318,6 +356,12 @@ sub create_tar_files {
         orig_dir    => File::Spec->curdir(),
         tmp_dir     => File::Temp->newdir(),
         webgen_base => "$FindBin::Bin/../../../exim-website",
+        tar_cmd     => 'tar',
+        compressors => {
+                gzip    => 1,
+                bzip2   => 1,
+                lzip    => 0,
+        },
     };
     my $delete;
     my $cleanup = 1;
@@ -327,6 +371,8 @@ sub create_tar_files {
         GetOptions(
             'directory=s'   => \$context->{directory},
             'webgen_base=s' => \$context->{webgen_base},
+            'tar'           => \$context->{tar_cmd},
+            'lzip!'         => \$context->{compressors}{lzip},
             'verbose!'      => \$verbose,
             'debug!'        => \$debug,
             'help|?'        => \$help,
@@ -342,6 +388,7 @@ sub create_tar_files {
     pod2usage( -verbose => 2 ) if $man;
 
     get_and_check_version( shift, $context );
+    fix_paths_tar($context);
     $context->{tag} = build_tag($context);
     deal_with_working_directory( $context, $delete );
     export_git_tree($context);
@@ -371,7 +418,9 @@ mk_exim_release.pl [options] version
    --verbose           force verbose mode
    --help              display this help and exits
    --man               displays man page
+   --tar=cmd           command to use for tar
    --directory=dir     dir to package
+   --no-lzip           do not create .tar.lz files
    --delete            Delete packaging directory at start
 
 =head1 OPTIONS
@@ -383,9 +432,19 @@ mk_exim_release.pl [options] version
 Forces debug mode cause all SQL statements generated by L<DBIx::Class>
 to be output.
 
+=item B<--tar>
+
+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<--lzip>
+
+Build the lzip tarballs.
+
 =item B<--verbose>
 
-Force verbose mode - currently this has no effect
+Force verbose mode
 
 =item B<--help>
 
@@ -415,3 +474,4 @@ Nigel Metheringham <Nigel.Metheringham@dev.intechnology.co.uk>
 Copyright 2010 Exim Maintainers. All rights reserved.
 
 =cut
+# vim: set sw=4 et :