X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=2159579ec333d4dabe7b60fcec1cdbff308b6955;hb=afbf6680b6636f5aeeceb87d873ea5935f57334b;hp=b197a24a8db430bdb93925a85a012bf6b425fc52;hpb=37d29c6f3453c0f472e0e800ed4a425e9d8eae97;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/makerel b/Porting/makerel
index b197a24..2159579 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -10,9 +10,26 @@
 # Tim Bunce, June 1997
 
 use ExtUtils::Manifest qw(fullcheck);
+$ExtUtils::Manifest::Quiet = 1;
+use Getopt::Std;
 
 $|=1;
-$relroot = "..";	# XXX make an option
+
+sub usage { die <<EOF; }
+usage: $0 [ -r rootdir ] [-s suffix ] [ -b ]
+    -r rootdir   directory under which to create the build dir and tarball
+                 defaults to '..'
+    -s suffix    suffix to append to to the perl-x.y.z dir and tarball name
+		 defaults to the concatenaion of the local_patches entry
+		 in patchlevel.h (or blank, if none)
+    -b           make a .bz2 file in addtion to a .gz file
+EOF
+
+my %opts;
+getopts('br:s:', \%opts) or usage;
+@ARGV && usage;
+
+$relroot = defined $opts{r} ? $opts{r} : "..";
 
 die "Must be in root of the perl source tree.\n"
 	unless -f "./MANIFEST" and -f "patchlevel.h";
@@ -37,6 +54,8 @@ $lpatch_tags   = join "-", @lpatch_tags;
 
 $perl = "perl-$vers";
 $reldir = "$perl";
+
+$lpatch_tags = $opts{s} if defined $opts{s};
 $reldir .= "-$lpatch_tags" if $lpatch_tags;
 
 print "\nMaking a release for $perl in $relroot/$reldir\n\n";
@@ -45,8 +64,15 @@ print "Cross-checking the MANIFEST...\n";
 ($missfile, $missentry) = fullcheck();
 @$missentry
     = grep {$_ !~ m!^\.git/! and $_ !~ m!(?:/|^)\.gitignore!} @$missentry;
-warn "Can't make a release with MANIFEST files missing.\n" if @$missfile;
-warn "Can't make a release with files not listed in MANIFEST.\n" if @$missentry;
+if (@$missfile ) {
+    warn "Can't make a release with MANIFEST files missing:\n";
+    warn "\t".$_."\n" for (@$missfile);
+}
+if (@$missentry ) {
+    warn "Can't make a release with files not listed in MANIFEST\n";
+    warn "\t".$_."\n" for (@$missentry);
+
+}
 if ("@$missentry" =~ m/\.orig\b/) {
     # Handy listing of find command and .orig files from patching work.
     # I tend to run 'xargs rm' and copy and paste the file list.
@@ -120,9 +146,6 @@ my @writables = qw(
     global.sym
     overload.c
     overload.h
-    pod/perlintern.pod
-    pod/perlapi.pod
-    pod/perltoc.pod
     perlapi.h
     perlapi.c
     ext/Devel-PPPort/module2.c
@@ -171,11 +194,26 @@ print "\n";
 
 chdir ".." or die $!;
 
-print "Creating and compressing the tar file...\n";
 my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
+
+print "Creating and compressing the tar.gz file...\n";
 $cmd = "tar cf - $reldir | gzip --best > $reldir.tar.gz";
-system($cmd) == 0
-    or die "$cmd failed";
+system($cmd) == 0 or die "$cmd failed";
+
+if ($opts{b}) {
+    print "Creating and compressing the tar.bz2 file...\n";
+    $cmd = "tar cf - $reldir | bzip2 > $reldir.tar.bz2";
+    system($cmd) == 0 or die "$cmd failed";
+}
+
 print "\n";
 
 system("ls -ld $perl*");
+print "\n";
+
+for my $sha (qw(sha1 shasum sha1sum)) {
+    if (`which $sha 2>/dev/null`) {
+	system("$sha $perl*.tar.*");
+	last;
+    }
+}