X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=42b24d6c8ebbf29d93d7fa54cacc8ebebc0ff172;hb=375b6f9c3cf61249fbff2151731131e9a0b72a6c;hp=1a00e973a36fea942bae0df4977a3a4280f4c824;hpb=3ffabb8c74e0e03284558b6100656cb83a8a35fb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/makerel b/Porting/makerel
index 1a00e97..42b24d6 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -1,4 +1,4 @@
-#!/bin/env perl -w
+#!/usr/bin/perl -w
 
 # A first attempt at some automated support for making a perl release.
 # Very basic but functional - if you're on a unix system.
@@ -20,19 +20,14 @@ die "Must be in root of the perl source tree.\n"
 open PATCHLEVEL,"<patchlevel.h" or die;
 my @patchlevel_h = <PATCHLEVEL>;
 close PATCHLEVEL;
-my $patchlevel_h = join "", grep { /^#define/ } @patchlevel_h;
+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);
+$vms_vers = sprintf("%d_%d_%d", $revision, $patchlevel, $subversion);
 
 # fetch list of local patches
 my (@local_patches, @lpatch_tags, $lpatch_tags);
@@ -41,7 +36,7 @@ my (@local_patches, @lpatch_tags, $lpatch_tags);
 @lpatch_tags   = map  {  /^\s*,"(\w+)/ } @local_patches;
 $lpatch_tags   = join "-", @lpatch_tags;
 
-$perl = "perl$vers";
+$perl = "perl-$vers";
 $reldir = "$perl";
 $reldir .= "-$lpatch_tags" if $lpatch_tags;
 
@@ -66,52 +61,119 @@ print "\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 $!;
+
 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 t ext lib -name '*.t'     -print | xargs chmod +x");
+system("find t ext lib -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/p4genpatch
+    Porting/patchls
+    Porting/*.pl
+    mpeix/nm
+    mpeix/relink
+    Cross/generate_config_sh
+    Cross/warp
 );
-system("chmod +x @exe");
-print "\n";
-
-
-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";
+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
+    pod/perlintern.pod
+    pod/perlapi.pod
+    perlapi.h
+    perlapi.c
+    ext/ByteLoader/byterun.h
+    ext/ByteLoader/byterun.c
+    ext/B/B/Asmdata.pm
+    ext/Devel/PPPort/PPPort.xs
+    ext/Devel/PPPort/module2.c
+    ext/Devel/PPPort/module3.c
+    regnodes.h
+    warnings.h
+    lib/warnings.pm
+    vms/perly_c.vms
+    vms/perly_h.vms
+    win32/Makefile
+    win32/makefile.mk
+    win32/config_H.bc
+    win32/config_H.gc
+    win32/config_H.vc
+    wince/config_H.ce
+    wince/Makefile.ce
+);
+system("chmod +w @writables") == 0
+    or die "system: $!";
+
+print "Adding CRs to DOSish files...\n";
+my @crlf = qw(
+    djgpp/configure.bat
+    README.ce
+    README.dos
+    README.win32
+    win32/Makefile
+    win32/makefile.mk
+    wince/Makefile.ce
+    wince/compile-all.bat
+    wince/README.perlce
+    wince/registry.bat
+);
+system("perl -pi -e 's/\\015*\\012/\\015\\012/' @crlf") == 0
+    or die "system: $!";
 print "\n";
 
-chdir $relroot or die $!;
+chdir ".." or die $!;
 
 print "Creating and compressing the tar file...\n";
 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";
+system($cmd) == 0
+    or die "$cmd failed";
 print "\n";
 
 system("ls -ld $perl*");