allow indirection between less and its hints stash name

[p5sagit/p5-mst-13.2.git] / Porting / makerel

diff --git a/Porting/makerel b/Porting/makerel
index b126164..e4dfdef 100644 (file)
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
-# A first attempt at some automated support for making a perl release.
+# A tool to build a perl release tarball
 # Very basic but functional - if you're on a unix system.
 #
 # No matter how automated this gets, you'll always need to read
-# and re-read pumpkin.pod checking for things to be done at various
-# stages of the process.
+# and re-read pumpkin.pod and release_managers_guide.pod to
+# check for things to be done at various stages of the process.
 #
 # Tim Bunce, June 1997
 
@@ -16,16 +16,17 @@ use Getopt::Std;
 $|=1;
 
 sub usage { die <<EOF; }
-usage: $0 [ -r rootdir ] [-s suffix ]
+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('r:s:', \%opts) or usage;
+getopts('br:s:', \%opts) or usage;
 @ARGV && usage;
 
 $relroot = defined $opts{r} ? $opts{r} : "..";
@@ -63,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.
@@ -93,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
@@ -109,7 +120,6 @@ my @exe = qw(
     opcode.pl
     t/TEST
     *.SH
-    vms/ext/Stdio/test.pl
     vms/ext/filespec.t
     x2p/*.SH
     Porting/findrfuncs
@@ -140,8 +150,8 @@ my @writables = qw(
     overload.h
     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
@@ -160,37 +170,28 @@ my @writables = qw(
 system("chmod +w @writables") == 0
     or die "system: $!";
 
-print "Adding CRs to DOSish files...\n";
-# This list is also in curliff.pl.
-my @crlf = qw(
-    djgpp/configure.bat
-    README.ce
-    README.dos
-    README.symbian
-    README.win32
-    symbian/config.pl
-    symbian/makesis.pl
-    symbian/README
-    symbian/xsbuild.pl
-    win32/Makefile
-    win32/Makefile.ce
-    win32/ce-helpers/compile-all.bat
-    win32/ce-helpers/compile.bat
-    win32/ce-helpers/registry.bat
-    win32/distclean.bat
-    win32/makefile.mk
-);
-system("perl -pi -e 's/\\015*\\012/\\015\\012/' @crlf") == 0
-    or die "system: $!";
-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;
+    }
+}