Sign .xz; upload to sf.net; upload .xz to local site.

1 files changed, 25 insertions, 3 deletions

diff --git a/dist-tools/makerelease.pl b/dist-tools/makerelease.pl
index 51b82854..f07af094 100755
--- a/dist-tools/makerelease.pl
+++ b/dist-tools/makerelease.pl
@@ -8,7 +8,8 @@
 my $project = "fetchmail";
 my $website = "http://developer.berlios.de/projects/$project";
 my $mailfrom = "<$project-devel\@lists.berlios.de> (Fetchmail Development Team)";
-my $distsufx = '.tar.bz2';
+my $distsufx =	'.tar.bz2';
+my $xzsufx =	'.tar.xz';
 
 # ---------------------------------------------------------------------
 
@@ -35,6 +36,19 @@ sub usage($$) {
     exit($_[1]);
 }
 
+sub makerelnotes($$) {
+    my ($infile, $outfile) = @_;
+    open(F, "<$infile") or die "cannot read $infile: $!";
+    open(G, ">$outfile") or die "cannot write to $outfile: $!";
+    my $ctr = 0;
+    while(<F>) {
+	$ctr++ if /^fetchmail-/;
+	print G if $ctr == 1;
+    }
+    close F or die "cannot read $infile: $!";
+    close G or die "cannot write to $outfile: $!";
+}
+
 GetOptions("diffs|d" => \$diffs, "verbose|v" => \$verbose, "help|h|?" => \$help)
     or usage($0, 1);
 
@@ -171,17 +185,25 @@ unlink("$tmp/$project.DIFFS.$$");
 
 print "### Signing tarballs...\n";
 system("cd autobuild && gpg -ba --sign $project-$version$distsufx");
+system("cd autobuild && gpg -ba --sign $project-$version$xzsufx");
+
+print "### Extracting release notes...\n";
+makerelnotes('NEWS', 'autobuild/README');
 
 print "### Uploading\n";
 print "=== local\n";
 
-system("cp", "autobuild/$project-$version$distsufx", "autobuild/$project-$version$distsufx.asc", "$ENV{HOME}/public_html/fetchmail/") and die "Cannot upload to \$HOME/public_html/fetchmail/: $!";
+system("cp", "autobuild/$project-$version$xzsufx", "autobuild/$project-$version$xzsufx.asc", "$ENV{HOME}/public_html/fetchmail/") and die "Cannot upload to \$HOME/public_html/fetchmail/: $!";
 
 print "=== berlios\n";
 
 system("lftp -e \"lcd autobuild ; mput $project-$version$distsufx $project-$version$distsufx.asc ; quit\" ftp.berlios.de:/incoming/") and warn "Upload to berlios failed: $!";
 
-print "Done - please review final tasks\n";
+print "=== sourceforge \n";
+system("rsync -acvHP autobuild/$project-$version$xzsufx autobuild/$project-$version$xzsufx.asc autobuild/README m-a\@frs.sourceforge.net:/home/frs/project/fetchmail/branch_6.3/");
+unlink 'autobuild/README' or die "cannot unlink autobuild/README: $!";
+
+print "=== Done - please review final tasks\n";
 
 system("cat RELEASE-INSTRUCTIONS");