X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=f51b4a547878e919e0a64871bb1244b5e65f7792;hb=6f7d0078e68bc6a1f2a59d66e229fb67ce3fbb40;hp=d6582edba1cdbce81e0f7ddb00934491eb6b8970;hpb=55d729e4e15089064cd25ed6dce2c105389f3837;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/makerel b/Porting/makerel
index d6582ed..f51b4a5 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -17,10 +17,13 @@ $relroot = "..";	# XXX make an option
 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+)/;
+$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);
@@ -31,12 +34,18 @@ if ($subversion) {
     $vms_vers.= "  ";
 }
 
-$perl = "perl$vers";
-$reldir = "$relroot/$perl";
-$reldir .= "-$ARGV[0]" if $ARGV[0];
+# 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;
 
-print "\nMaking a release for $perl in $reldir\n\n";
+$perl = "perl$vers";
+$reldir = "$perl";
+$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();
@@ -52,25 +61,38 @@ if ("@$missentry" =~ m/\.orig\b/) {
 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 "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 "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 $!;
 
 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");
-system("chmod +w configure"); # special case (see pumpkin.pod)
-@exe = qw(
+my @exe = qw(
     Configure
     configpm
-    configure
     embed.pl
     installperl
     installman
     keywords.pl
-    myconfig
     opcode.pl
     perly.fixer
     t/TEST
@@ -78,32 +100,49 @@ system("chmod +w configure"); # special case (see pumpkin.pod)
     *.SH
     vms/ext/Stdio/test.pl
     vms/ext/filespec.t
-    vms/fndvers.com
     x2p/*.SH
     Porting/patchls
     Porting/makerel
 );
 system("chmod +x @exe");
-print "\n";
-
-
-print "Creating $reldir release directory...\n";
-die "$reldir release directory already exists\n"   if -e "../$reldir";
-die "$reldir.tar.gz release file already exists\n" if -e "../$reldir.tar.gz";
-mkdir($reldir, 0755) or die "mkdir $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 $reldir";
-system($cmd) == 0 or die "$cmd failed";
+my @writables = qw(
+    embed.h
+    embedvar.h
+    ext/B/B/Asmdata.pm
+    ext/ByteLoader/byterun.c
+    ext/ByteLoader/byterun.h
+    global.sym
+    keywords.h
+    lib/warnings.pm
+    objXSUB.h
+    opcode.h
+    pp.sym
+    pp_proto.h
+    regnodes.h
+    warnings.h
+    win32/config_H.bc
+    win32/config_H.gc
+    win32/config_H.vc
+);
+system("chmod +w @writables");
+
+print "Adding CRs to DOSish files...\n";
+my @crlf = qw(
+    djgpp/configure.bat
+    README.dos
+    README.win32
+    win32/Makefile
+    win32/makefile.mk
+);
+system("perl -pi -e 's/\$/\\r/' @crlf");
 print "\n";
 
-chdir $relroot or die $!;
+chdir ".." or die $!;
 
 print "Creating and compressing the tar file...\n";
-$cmd = "tar cf - $perl | gzip --best > $perl.tar.gz";
+my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
+$cmd = "tar cf - $reldir | gzip --best > $reldir.tar.gz";
 system($cmd) == 0 or die "$cmd failed";
 print "\n";