release tooling: unbreak website build when not verbose

[users/jgh/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 e3267fd3e80efb5f5ecf8e68252681a1dbac557e..a68d1e66a07c40a39ee697808f1ccdff6a91881b 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -149,9 +149,9 @@ 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',
-        (($verbose||$debug) ? '--verbose' : '')
+        $templates, '--docroot', $dir,                 '--localstatic'

     );
     );

+    push @cmd, '--verbose' if $verbose or $debug;

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


@@ -193,7 +193,7 @@ sub build_documentation {
 
     my $docdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-docbook' );
     # documentation building gets the truncated release, without RC
 
     my $docdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-docbook' );
     # documentation building gets the truncated release, without RC

-    system("cd '$docdir' && ./OS-Fixups && make EXIM_VER=$context->{trelease} everything") == 0
+    system("cd '$docdir' && ./OS-Fixups && $context->{make_cmd} EXIM_VER=$context->{trelease} everything") == 0

       || croak "Doc build failed";
 
     copy_docbook_files($context);
       || croak "Doc build failed";
 
     copy_docbook_files($context);


@@ -223,7 +223,11 @@ sub move_text_docs_into_pkg {
         next
           if ( ( $fn eq 'ABOUT' )
             || ( $fn eq 'ChangeLog.0' )
         next
           if ( ( $fn eq 'ABOUT' )
             || ( $fn eq 'ChangeLog.0' )

-            || ( $fn eq 'test-harness.txt' ) );
+            || ( $fn eq 'test-harness.txt' )
+            # Debian issue re licensing of RFCs
+            || ( $fn =~ /^draft-ietf-.*/ )
+            || ( $fn =~ /^rfc.*/ )
+             );

         move( $file, File::Spec->catfile( $new_docdir, $fn ) );
     }
 }
         move( $file, File::Spec->catfile( $new_docdir, $fn ) );
     }
 }


@@ -359,6 +363,7 @@ sub create_tar_files {
         tmp_dir     => File::Temp->newdir(),
         webgen_base => "$FindBin::Bin/../../../exim-website",
         tar_cmd     => 'tar',
         tmp_dir     => File::Temp->newdir(),
         webgen_base => "$FindBin::Bin/../../../exim-website",
         tar_cmd     => 'tar',

+        make_cmd    => 'make',

         compressors => {
                 gzip    => 1,
                 bzip2   => 1,
         compressors => {
                 gzip    => 1,
                 bzip2   => 1,


@@ -373,7 +378,8 @@ sub create_tar_files {
         GetOptions(
             'directory=s'   => \$context->{directory},
             'webgen_base=s' => \$context->{webgen_base},
         GetOptions(
             'directory=s'   => \$context->{directory},
             'webgen_base=s' => \$context->{webgen_base},

-            'tar'           => \$context->{tar_cmd},
+            'tar=s'         => \$context->{tar_cmd},
+            'make=s'        => \$context->{make_cmd},

             'lzip!'         => \$context->{compressors}{lzip},
             'verbose!'      => \$verbose,
             'debug!'        => \$debug,
             'lzip!'         => \$context->{compressors}{lzip},
             'verbose!'      => \$verbose,
             'debug!'        => \$debug,


@@ -421,6 +427,7 @@ mk_exim_release.pl [options] version
    --help              display this help and exits
    --man               displays man page
    --tar=cmd           command to use for tar
    --help              display this help and exits
    --man               displays man page
    --tar=cmd           command to use for tar

+   --make=cmd          command to use for make

    --directory=dir     dir to package
    --no-lzip           do not create .tar.lz files
    --delete            Delete packaging directory at start
    --directory=dir     dir to package
    --no-lzip           do not create .tar.lz files
    --delete            Delete packaging directory at start


@@ -440,6 +447,11 @@ 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.
 
 gtar, and if not found use tar.  Need GNU tar for lzip, unless --no-lzip is
 used.
 

+=item B<--make>
+
+Use to override the path/name of the make command.
+Useful sometimes to force gmake.
+

 =item B<--lzip>
 
 Build the lzip tarballs.
 =item B<--lzip>
 
 Build the lzip tarballs.