From 8209860428405ca97e51dad4d91c3624893ad227 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 5 Feb 2010 01:06:08 +0000
Subject: Getting ready for 6.3.14 release.

svn path=/branches/BRANCH_6-3/; revision=5480
---
 dist-tools/makerelease | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'dist-tools')

diff --git a/dist-tools/makerelease b/dist-tools/makerelease
index 26a483e1..59b120e3 100755
--- a/dist-tools/makerelease
+++ b/dist-tools/makerelease
@@ -12,6 +12,8 @@ $svnrepos = "http://mknod.org/svn/$project";
 $website = "http://developer.berlios.de/projects/$project";
 $mailfrom = "<$project-devel-owner\@lists.berlios.de> (Fetchmail Development Team)";
 
+die "Need GNU sort!" unless `sort --version | head -n1` =~ /GNU/;
+
 # parse options
 $diffs = 0;
 $verbose = 0;
@@ -44,7 +46,7 @@ $tag = "RELEASE_$version";
 $tag =~ tr/./-/;
 
 # extract existing tags
-open(ID, "-|", "svn", "ls", $svnrepos . "/tags") || die "cannot run svn ls: $!\naborting";
+open(ID, "svn ls \"$svnrepos/tags\" | sort -t- -k1,1 -k2,2n -k3,3n |") || die "cannot run svn ls: $!\naborting";
 while (<ID>) {
     if (m{^(RELEASE_.*)/}) {
 	unshift(@versions, $1);
@@ -76,14 +78,14 @@ if (system("autoreconf -isv")) {
 }
 
 print "### Test-building the software...\n";
-if (system("mkdir -p autobuild && cd autobuild && ../configure -C --silent && make -s clean && make distcheck")) {
+if (system("mkdir -p autobuild && cd autobuild && ../configure -C --silent && make -s clean && make check distcheck")) {
 	die("Compilation failure\n");
 }
 
-print "### Building the RPMs...\n";
-if (system("cd autobuild && cp ../fetchmail.xpm . && buildrpms $project-${version}.tar.bz2 $null")) {
-	die("RPM-build failure\n");
-}
+# print "### Building the RPMs...\n";
+# if (system("cd autobuild && cp ../fetchmail.xpm . && buildrpms $project-${version}.tar.bz2 $null")) {
+# 	die("RPM-build failure\n");
+# }
 
 open(REPORT, ">$tmp/$project.PREAMBLE.$$");
 
@@ -144,7 +146,7 @@ if ($diffs) {
 	    ." -n -D 'diff between $oldver and $version' -m 'text/plain' -e 7bit -f $tmp/$project.DIFFS.$$"
 	    ." -o ANNOUNCE.EMAIL";
 } else {
-	system(mv, "$tmp/$project.PREAMBLE.$$", "ANNOUNCE.EMAIL");
+	system("mv", "$tmp/$project.PREAMBLE.$$", "ANNOUNCE.EMAIL");
 }
 
 #unlink("$tmp/$project.PREAMBLE.$$");
-- 
cgit v1.2.3