X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=ce7a9edd824d3d9fd6dd129f38a08371cc660b09;hb=f662f3b795bf72e495d34174bea334bddb3c6d0f;hp=ac80aaa3856ea543f9ac3310ce4edba797755f76;hpb=18b94d96896c137685cc994bbb9c274b9d9bbb6d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/makerel b/Porting/makerel
index ac80aaa..ce7a9ed 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,14 +54,25 @@ $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";
 
 print "Cross-checking the MANIFEST...\n";
 ($missfile, $missentry) = fullcheck();
-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;
+@$missentry
+    = grep {$_ !~ m!^\.git/! and $_ !~ m!(?:/|^)\.gitignore!} @$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.
@@ -73,11 +101,14 @@ print "\n";
 
 chdir "$relroot/$reldir" or die $!;
 
+
+my $SEARCH_ROOTS = 't ext lib dist cpan';
+
 print "Setting file permissions...\n";
 system("find . -type f -print     | xargs chmod 0444");
 system("find . -type d -print     | xargs chmod 0755");
-system("find t ext lib -name '*.t'     -print | xargs chmod +x");
-system("find t ext lib -name 'test.pl' -print | xargs chmod +x");
+system("find $SEARCH_ROOTS -name '*.t'     -print | xargs chmod +x");
+system("find $SEARCH_ROOTS -name 'test.pl' -print | xargs chmod +x");
 my @exe = qw(
     Configure
     configpm
@@ -89,14 +120,11 @@ my @exe = qw(
     opcode.pl
     t/TEST
     *.SH
-    vms/ext/Stdio/test.pl
     vms/ext/filespec.t
     x2p/*.SH
     Porting/findrfuncs
     Porting/genlog
     Porting/makerel
-    Porting/p4genpatch
-    Porting/patchls
     Porting/*.pl
     mpeix/nm
     mpeix/relink
@@ -120,13 +148,10 @@ 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
-    ext/Devel/PPPort/module3.c
+    cpan/Devel-PPPort/module2.c
+    cpan/Devel-PPPort/module3.c
     reentr.c
     reentr.h
     regcharclass.h
@@ -171,11 +196,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;
+    }
+}