Unbreak release.sh for final releases

[users/heiko/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 0697124cac4b3acd8a5b84939d5a33315cbaa680..07e99b6d2d0b788e2a5fdbe4b010cdfadcebda47 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -1,7 +1,5 @@
 #!/usr/bin/env perl
-#
-# $Cambridge: exim/release-process/scripts/mk_exim_release.pl,v 1.1 2010/06/03 12:00:38 nm4 Exp $
-#
+
 use strict;
 use warnings;
 use Carp;
@@ -11,6 +9,7 @@ use File::Path;
 use File::Temp;
 use FindBin;
 use Getopt::Long;
+use IO::File;
 use Pod::Usage;
 
 my $debug   = 0;
@@ -73,7 +72,7 @@ sub deal_with_working_directory {
     mkpath( $context->{directory}, { verbose => ( $verbose || $debug ) } );
 
     # set and create subdirectories
-    foreach (qw(release_tree pkgs pkgdirs docbook)) {
+    foreach (qw(release_tree pkgs pkgdirs docbook tmp)) {
         $context->{$_} = File::Spec->catdir( $context->{directory}, $_ );
         mkpath( $context->{$_}, { verbose => ( $verbose || $debug ) } );
     }
@@ -85,7 +84,7 @@ sub export_git_tree {
     my $context = shift;
 
     # build git command
-    my $archive_file = sprintf( '%s/%s-%s.tar', $context->{tmp_dir}, $context->{pkgname}, $context->{release} );
+    my $archive_file = sprintf( '%s/%s-%s.tar', $context->{tmp}, $context->{pkgname}, $context->{release} );
     $context->{tmp_archive_file} = $archive_file;
     my @cmd = ( 'git', 'archive', '--format=tar', "--output=$archive_file", $context->{tag} );
 
@@ -109,6 +108,33 @@ sub unpack_tree {
 
 # ------------------------------------------------------------------
 
+sub make_version_script {
+    my $context = shift;
+
+    my $variant = substr( $context->{release}, length($context->{trelease}) );
+    if ( $context->{release} ne $context->{trelease} . $variant ) {
+        die "Broken version numbering, I'm buggy";
+    }
+
+    my $srcdir    = File::Spec->catdir( $context->{release_tree}, 'src', 'src' );
+    chdir $srcdir or die "chdir $srcdir: $\n";
+
+    if ( -f "version.sh" ) {
+        print( "WARNING: version.sh already exists - leaving it in place\n" );
+        return;
+    }
+
+    my @cmd = ("../scripts/reversion", "release");
+    print( "Running: ", join( ' ', @cmd ), "\n" ) if ($verbose);
+    system(@cmd) == 0 || croak "reversion failed";
+
+    unlink "version.h";
+
+    -f "version.sh" or die "failed to create version.h";
+}
+
+# ------------------------------------------------------------------
+
 sub build_html_documentation {
     my $context = shift;
 
@@ -174,7 +200,8 @@ sub build_documentation {
 sub move_text_docs_into_pkg {
     my $context = shift;
 
-    my $old_docdir = File::Spec->catdir( $context->{eximpkgdir}, 'doc', 'doc-docbook' );
+    my $old_docdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-docbook' );
+    my $old_txtdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-txt' );
     my $new_docdir = File::Spec->catdir( $context->{eximpkgdir}, 'doc' );
     mkpath( $new_docdir, { verbose => ( $verbose || $debug ) } );
 
@@ -184,7 +211,7 @@ sub move_text_docs_into_pkg {
     }
 
     # move text documents across
-    foreach my $file ( glob( File::Spec->catfile( 'doc/doc-txt', '*' ) ) ) {
+    foreach my $file ( glob( File::Spec->catfile( $old_txtdir, '*' ) ) ) {
 
         # skip a few we dont want
         my $fn = ( File::Spec->splitpath($file) )[2];
@@ -318,6 +345,7 @@ sub create_tar_files {
     export_git_tree($context);
     chdir( $context->{directory} ) || die;
     unpack_tree($context);
+    make_version_script($context);
     build_documentation($context);
     build_package_directories($context);
     create_tar_files($context);