X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=e4dfdefbc797b2b506c0061367ea062f06b3c8e4;hb=a725df954c99dfa9de8864cdcc07f04fd5445563;hp=809de9bbec0af9929d66195e04afd4d2166e2919;hpb=14a3f2583754af00b513dcdf22451c4b77be6644;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/makerel b/Porting/makerel
index 809de9b..e4dfdef 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -1,47 +1,78 @@
-#!/bin/env perl -w
+#!/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
 
 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";
 
-$patchlevel_h = `grep '#define ' patchlevel.h`;
+open PATCHLEVEL,"<patchlevel.h" or die;
+my @patchlevel_h = <PATCHLEVEL>;
+close PATCHLEVEL;
+my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h;
 print $patchlevel_h;
-$patchlevel = $1 if $patchlevel_h =~ /PATCHLEVEL\s+(\d+)/;
-$subversion = $1 if $patchlevel_h =~ /SUBVERSION\s+(\d+)/;
+$revision = $1 if $patchlevel_h =~ /PERL_REVISION\s+(\d+)/;
+$patchlevel = $1 if $patchlevel_h =~ /PERL_VERSION\s+(\d+)/;
+$subversion = $1 if $patchlevel_h =~ /PERL_SUBVERSION\s+(\d+)/;
 die "Unable to parse patchlevel.h" unless $subversion >= 0;
-$vers = sprintf("5.%03d", $patchlevel);
-$vms_vers = sprintf("5_%03d", $patchlevel);
-if ($subversion) {
-    $vers.= sprintf( "_%02d", $subversion);
-    $vms_vers.= sprintf( "%02d", $subversion);
-} else {
-    $vms_vers.= "  ";
-}
+$vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion);
+
+# fetch list of local patches
+my (@local_patches, @lpatch_tags, $lpatch_tags);
+@local_patches = grep { /^static.*local_patches/../^};/ } @patchlevel_h;
+@local_patches = grep { !/^\s*,?NULL/  } @local_patches;
+@lpatch_tags   = map  {  /^\s*,"(\w+)/ } @local_patches;
+$lpatch_tags   = join "-", @lpatch_tags;
 
-$perl = "perl$vers";
+$perl = "perl-$vers";
 $reldir = "$perl";
-$reldir .= "-$ARGV[0]" if $ARGV[0];
 
-print "\nMaking a release for $perl in $relroot/$reldir\n\n";
+$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.
@@ -53,56 +84,114 @@ die "Aborted.\n" if @$missentry or @$missfile;
 print "\n";
 
 # VMS no longer has hardcoded version numbers descrip.mms
-#print "Updating VMS version specific files with $vms_vers...\n";
-#system("perl -pi -e 's/^\QPERL_VERSION = \E\d\_\d+(\s*\#)/PERL_VERSION = $vms_vers$1/' vms/descrip.mms");
 
+print "Creating $relroot/$reldir release directory...\n";
+die "$relroot/$reldir release directory already exists\n"   if -e "$relroot/$reldir";
+die "$relroot/$reldir.tar.gz release file already exists\n" if -e "$relroot/$reldir.tar.gz";
+mkdir("$relroot/$reldir", 0755) or die "mkdir $relroot/$reldir: $!\n";
+print "\n";
+
+
+print "Copying files to release directory...\n";
+# ExtUtils::Manifest maniread does not preserve the order
+$cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $relroot/$reldir";
+system($cmd) == 0
+    or die "$cmd failed";
+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 -w");
-system("find . -type d -print     | xargs chmod g-s");
-system("find t -name '*.t' -print | xargs chmod +x");
-@exe = qw(
+system("find . -type f -print     | xargs chmod 0444");
+system("find . -type d -print     | xargs chmod 0755");
+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
+    configure.gnu
     embed.pl
     installperl
     installman
     keywords.pl
-    myconfig
     opcode.pl
-    perly.fixer
     t/TEST
-    t/*/*.t
     *.SH
-    vms/ext/Stdio/test.pl
     vms/ext/filespec.t
     x2p/*.SH
-    Porting/patchls
+    Porting/findrfuncs
+    Porting/genlog
     Porting/makerel
+    Porting/*.pl
+    mpeix/nm
+    mpeix/relink
+    Cross/generate_config_sh
+    Cross/warp
 );
-system("chmod +x @exe");
-print "\n";
+system("chmod +x @exe") == 0
+    or die "system: $!";
+
+my @writables = qw(
+    NetWare/config_H.wc
+    NetWare/Makefile
+    keywords.h
+    opcode.h
+    opnames.h
+    pp_proto.h
+    pp.sym
+    proto.h
+    embed.h
+    embedvar.h
+    global.sym
+    overload.c
+    overload.h
+    perlapi.h
+    perlapi.c
+    cpan/Devel-PPPort/module2.c
+    cpan/Devel-PPPort/module3.c
+    reentr.c
+    reentr.h
+    regcharclass.h
+    regnodes.h
+    warnings.h
+    lib/warnings.pm
+    win32/Makefile
+    win32/Makefile.ce
+    win32/makefile.mk
+    win32/config_H.bc
+    win32/config_H.gc
+    win32/config_H.vc
+    utils/Makefile
+    uconfig.h
+);
+system("chmod +w @writables") == 0
+    or die "system: $!";
 
+chdir ".." or die $!;
 
-print "Creating $relroot/$reldir release directory...\n";
-die "$relroot/$reldir release directory already exists\n"   if -e "$relroot/$reldir";
-die "$relroot/$reldir.tar.gz release file already exists\n" if -e "$relroot/$reldir.tar.gz";
-mkdir("$relroot/$reldir", 0755) or die "mkdir $relroot/$reldir: $!\n";
-print "\n";
-
+my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
 
-print "Copying files to release directory...\n";
-# ExtUtils::Manifest maniread does not preserve the order
-$cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $relroot/$reldir";
+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";
-print "\n";
 
-chdir $relroot or die $!;
+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 "Creating and compressing the tar file...\n";
-my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
-$cmd = "tar cf - $reldir | gzip --best > $perl.tar.gz";
-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;
+    }
+}