Porting/makerel tweaks

p4raw-id: //depot/maint-5.005/perl@1709

1 files changed, 25 insertions, 17 deletions

diff --git a/Porting/makerel b/Porting/makerel
index 1a00e973a3..72005b4841 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -66,11 +66,27 @@ 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 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(
+my @exe = qw(
     Configure
     configpm
     embed.pl
@@ -90,24 +106,16 @@ system("find t -name '*.t' -print | xargs chmod +x");
     Porting/makerel
 );
 system("chmod +x @exe");
+my @crlf = qw(
+    djgpp/configure.bat
+    README.dos
+    README.win32
+    win32/Makefile
+    win32/makefile.mk
+);
+system("perl -pi -e 's/\$/\\r/' @crlf");
 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";
-print "\n";
-
-chdir $relroot 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";