src/deliver.c: log the error message when unlink(spoolname) fails

[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 dd30f2768cac8acd8ae5acc1e59f94efb0e5f48c..6109335499632b642a94a51805d1c4960eb45306 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -8,6 +8,8 @@ use Carp;
 use File::Copy;
 use File::Spec;
 use File::Path;
 use File::Copy;
 use File::Spec;
 use File::Path;

+use File::Temp;
+use FindBin;

 use Getopt::Long;
 use Pod::Usage;
 
 use Getopt::Long;
 use Pod::Usage;
 


@@ -18,18 +20,24 @@ my $verbose = 0;
 
 sub get_and_check_version {
     my $release = shift;
 
 sub get_and_check_version {
     my $release = shift;

+    my $context = shift;

 
     # make sure this looks like a real release version
 
     # make sure this looks like a real release version

-    # which should (currently) be 4.xx
+    # which should (currently) be 4.xx or 4.xx_RCx

     unless ( $release =~ /^(4\.\d\d(?:_RC\d+)?)$/ ) {
         croak "The given version number does not look right - $release";
     }
     unless ( $release =~ /^(4\.\d\d(?:_RC\d+)?)$/ ) {
         croak "The given version number does not look right - $release";
     }

-    return $1;    # untainted here...
+    my $full_release  = $1;              # untainted here...
+    my $trunc_release = $full_release;
+    $trunc_release =~ s/^(4\.\d\d)(?:_RC\d+)?$/$1/;
+
+    $context->{release}  = $full_release;
+    $context->{trelease} = $trunc_release;

 }
 
 # ------------------------------------------------------------------
 
 }
 
 # ------------------------------------------------------------------
 

-sub build_cvs_tag {
+sub build_tag {

     my $context = shift;
 
     # The CVS tag consists of exim-$version where $version
     my $context = shift;
 
     # The CVS tag consists of exim-$version where $version


@@ -66,22 +74,64 @@ sub deal_with_working_directory {
 
 # ------------------------------------------------------------------
 
 
 # ------------------------------------------------------------------
 

-sub export_cvs_tree {
+sub export_git_tree {

     my $context = shift;
 
     my $context = shift;
 

-    # build CVS command
-    my @cmd = ( 'cvs', '-d', $context->{cvsroot}, '-Q', 'export', '-r', $context->{tag}, $context->{pkgname}, );
+    # build git command
+    my $archive_file = sprintf( '%s/%s-%s.tar', $context->{tmp_dir}, $context->{pkgname}, $context->{release} );
+    $context->{tmp_archive_file} = $archive_file;
+    my @cmd = ( 'git', 'archive', '--format=tar', "--output=$archive_file", $context->{tag} );

 
 

-    # run cvs command
+    # run git command

     print( "Running: ", join( ' ', @cmd ), "\n" ) if ($verbose);
     system(@cmd) == 0 || croak "Export failed";
 }
 
 # ------------------------------------------------------------------
 
     print( "Running: ", join( ' ', @cmd ), "\n" ) if ($verbose);
     system(@cmd) == 0 || croak "Export failed";
 }
 
 # ------------------------------------------------------------------
 

+sub unpack_tree {
+    my $context = shift;
+
+    die "Cannot see archive file\n" unless ( -f $context->{tmp_archive_file} );
+    my @cmd = ( 'tar', 'xf', $context->{tmp_archive_file} );
+
+    # run  command
+    print( "Running: ", join( ' ', @cmd ), "\n" ) if ($verbose);
+    system(@cmd) == 0 || croak "Unpack failed";
+}
+
+# ------------------------------------------------------------------
+
+sub build_html_documentation {
+    my $context = shift;
+
+    my $genpath   = $context->{webgen_base} . '/script/gen.pl';
+    my $templates = $context->{webgen_base} . '/templates';
+    my $dir       = 'html';
+    mkdir($dir);
+
+    my @cmd = (
+        $genpath,                     '--spec',    'doc/doc-docbook/spec.xml', '--filter',
+        'doc/doc-docbook/filter.xml', '--latest',  $context->{trelease},       '--tmpl',
+        $templates,                   '--docroot', $dir
+    );
+
+    print "Executing ", join( ' ', @cmd ), "\n";
+    system(@cmd);
+
+    # move directory into right place
+    rename( sprintf( 'html/exim-html-%s', $context->{trelease} ), sprintf( 'exim-html-%s', $context->{release} ) );
+}
+
+# ------------------------------------------------------------------
+

 sub build_documentation {
 sub build_documentation {

-    system("cd exim/exim-doc/doc-docbook && ./OS-Fixups && make everything") == 0
+    my $context = shift;
+
+    system("cd doc/doc-docbook && ./OS-Fixups && make everything") == 0

       || croak "Doc build failed";
       || croak "Doc build failed";

+
+    build_html_documentation($context);

 }
 
 # ------------------------------------------------------------------
 }
 
 # ------------------------------------------------------------------


@@ -89,7 +139,7 @@ sub build_documentation {
 sub move_text_docs_into_pkg {
     my $context = shift;
 
 sub move_text_docs_into_pkg {
     my $context = shift;
 

-    my $old_docdir = 'exim/exim-doc/doc-docbook';
+    my $old_docdir = 'doc/doc-docbook';

     my $new_docdir = File::Spec->catdir( $context->{pkgdir}, 'doc' );
     mkpath( $new_docdir, { verbose => ( $verbose || $debug ) } );
 
     my $new_docdir = File::Spec->catdir( $context->{pkgdir}, 'doc' );
     mkpath( $new_docdir, { verbose => ( $verbose || $debug ) } );
 


@@ -99,7 +149,7 @@ sub move_text_docs_into_pkg {
     }
 
     # move text documents across
     }
 
     # move text documents across

-    foreach my $file ( glob( File::Spec->catfile( 'exim/exim-doc/doc-txt', '*' ) ) ) {
+    foreach my $file ( glob( File::Spec->catfile( 'doc/doc-txt', '*' ) ) ) {

 
         # skip a few we dont want
         my $fn = ( File::Spec->splitpath($file) )[2];
 
         # skip a few we dont want
         my $fn = ( File::Spec->splitpath($file) )[2];


@@ -126,7 +176,7 @@ sub build_pspdfinfo_directory {
         foreach my $file (
             glob(
                 File::Spec->catfile(
         foreach my $file (
             glob(
                 File::Spec->catfile(

-                    'exim/exim-doc/doc-docbook',
+                    'doc/doc-docbook',

                     (
                         ( $format eq 'postscript' )
                         ? '*.ps'
                     (
                         ( $format eq 'postscript' )
                         ? '*.ps'


@@ -144,30 +194,13 @@ sub build_pspdfinfo_directory {
 
 # ------------------------------------------------------------------
 
 
 # ------------------------------------------------------------------
 

-sub build_html_directory {
-    my $context = shift;
-
-    my $dir = sprintf( 'exim-%s-%s', 'html', $context->{release} );
-    my $target = File::Spec->catdir( $dir, 'doc', 'html' );
-    mkpath( $target, { verbose => ( $verbose || $debug ) } );
-
-    # move documents across
-    move( File::Spec->catdir( 'exim/exim-doc/doc-docbook', 'spec_html' ), File::Spec->catdir( $target, 'spec_html' ) );
-    foreach my $file ( glob( File::Spec->catfile( 'exim/exim-doc/doc-docbook', '*.html' ) ) ) {
-        my $fn = ( File::Spec->splitpath($file) )[2];
-        move( $file, File::Spec->catfile( $target, $fn ) );
-    }
-}
-
-# ------------------------------------------------------------------
-

 sub build_main_package_directory {
     my $context = shift;
 
     # initially we move the exim-src directory to the new directory name
     my $pkgdir = sprintf( 'exim-%s', $context->{release} );
     $context->{pkgdir} = $pkgdir;
 sub build_main_package_directory {
     my $context = shift;
 
     # initially we move the exim-src directory to the new directory name
     my $pkgdir = sprintf( 'exim-%s', $context->{release} );
     $context->{pkgdir} = $pkgdir;

-    rename( 'exim/exim-src', $pkgdir ) || croak "Rename of src dir failed - $!";
+    rename( 'src', $pkgdir ) || croak "Rename of src dir failed - $!";

 
     # add Local subdirectory
     my $target = File::Spec->catdir( $pkgdir, 'Local' );
 
     # add Local subdirectory
     my $target = File::Spec->catdir( $pkgdir, 'Local' );


@@ -184,7 +217,6 @@ sub build_package_directories {
 
     build_main_package_directory($context);
     build_pspdfinfo_directory($context);
 
     build_main_package_directory($context);
     build_pspdfinfo_directory($context);

-    build_html_directory($context);

 }
 
 # ------------------------------------------------------------------
 }
 
 # ------------------------------------------------------------------


@@ -203,22 +235,23 @@ sub create_tar_files {
     my $man;
     my $help;
     my $context = {
     my $man;
     my $help;
     my $context = {

-        cvsroot  => ':ext:nm4@vcs.exim.org:/home/cvs',
-        pkgname  => 'exim',
-        orig_dir => File::Spec->curdir(),
+        pkgname     => 'exim',
+        orig_dir    => File::Spec->curdir(),
+        tmp_dir     => File::Temp->newdir(),
+        webgen_base => "$FindBin::Bin/../../../exim-website",

     };
     my $delete;
     };
     my $delete;

-    $ENV{'PATH'} = '/opt/local/bin:' . $ENV{'PATH'};
+    ##$ENV{'PATH'} = '/opt/local/bin:' . $ENV{'PATH'};

 
     unless (
         GetOptions(
 
     unless (
         GetOptions(

-            'directory=s' => \$context->{directory},
-            'cvsroot=s'   => \$context->{cvsroot},
-            'verbose!'    => \$verbose,
-            'debug!'      => \$debug,
-            'help|?'      => \$help,
-            'man!'        => \$man,
-            'delete!'     => \$delete,
+            'directory=s'   => \$context->{directory},
+            'webgen_base=s' => \$context->{webgen_base},
+            'verbose!'      => \$verbose,
+            'debug!'        => \$debug,
+            'help|?'        => \$help,
+            'man!'          => \$man,
+            'delete!'       => \$delete,

         )
       )
     {
         )
       )
     {


@@ -227,11 +260,12 @@ sub create_tar_files {
     pod2usage(0) if $help;
     pod2usage( -verbose => 2 ) if $man;
 
     pod2usage(0) if $help;
     pod2usage( -verbose => 2 ) if $man;
 

-    $context->{release} = get_and_check_version(shift);
-    $context->{tag}     = build_cvs_tag($context);
+    get_and_check_version( shift, $context );
+    $context->{tag} = build_tag($context);

     deal_with_working_directory( $context, $delete );
     deal_with_working_directory( $context, $delete );

+    export_git_tree($context);

     chdir( $context->{directory} ) || die;
     chdir( $context->{directory} ) || die;

-    export_cvs_tree($context);
+    unpack_tree($context);

     build_documentation($context);
     build_package_directories($context);
     create_tar_files($context);
     build_documentation($context);
     build_package_directories($context);
     create_tar_files($context);


@@ -255,7 +289,6 @@ mk_exim_release.pl [options] version
    --help              display this help and exits
    --man               displays man page
    --directory=dir     dir to package
    --help              display this help and exits
    --man               displays man page
    --directory=dir     dir to package

-   --cvsroot=s         CVS root spec

    --delete            Delete packaging directory at start
 
 =head1 OPTIONS
    --delete            Delete packaging directory at start
 
 =head1 OPTIONS


@@ -285,11 +318,8 @@ Display man page
 
 Builds an exim release.
 
 
 Builds an exim release.
 

-Starting in an empty directory, with the CVS repo already tagged
-for release, build docs, build packages etc.
-
-NB The CVS root spec is embedded in the script or can be given via
-the I<--cvsroot> parameter
+Starting in a populated git repo that has already been tagged for
+release, build docs, build packages etc.

 
 Parameter is the version number to build as - ie 4.72 4.72RC1 etc
 
 
 Parameter is the version number to build as - ie 4.72 4.72RC1 etc
 


@@ -299,6 +329,6 @@ Nigel Metheringham <Nigel.Metheringham@dev.intechnology.co.uk>
 
 =head1 COPYRIGHT
 
 
 =head1 COPYRIGHT
 

-Copyright 2009 Someone. All rights reserved.
+Copyright 2010 Exim Maintainers. All rights reserved.

 
 =cut
 
 =cut