X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=ce7a9edd824d3d9fd6dd129f38a08371cc660b09;hb=07962d9a9be57321e306c86241903a78862dad8e;hp=415d8d6d2f60d5638c84424e48c858e137d8fa95;hpb=3e786a109b5852a8d614c8397d2b8b841e916e1d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Porting/makerel b/Porting/makerel index 415d8d6..ce7a9ed 100644 --- a/Porting/makerel +++ b/Porting/makerel @@ -10,9 +10,26 @@ # 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 <= 0; $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); @@ -38,14 +54,25 @@ $lpatch_tags = join "-", @lpatch_tags; $perl = "perl-$vers"; $reldir = "$perl"; + +$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. @@ -57,10 +84,6 @@ 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"; @@ -72,16 +95,20 @@ 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($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 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 @@ -91,22 +118,21 @@ my @exe = qw( installman keywords.pl opcode.pl - perly.fixer t/TEST *.SH - vms/ext/Stdio/test.pl vms/ext/filespec.t x2p/*.SH 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"); +system("chmod +x @exe") == 0 + or die "system: $!"; my @writables = qw( NetWare/config_H.wc @@ -120,54 +146,76 @@ my @writables = qw( embed.h embedvar.h global.sym - pod/perlintern.pod - pod/perlapi.pod + overload.c + overload.h 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 + cpan/Devel-PPPort/module2.c + cpan/Devel-PPPort/module3.c + reentr.c + reentr.h + regcharclass.h regnodes.h warnings.h lib/warnings.pm - vms/perly_c.vms - vms/perly_h.vms win32/Makefile + win32/Makefile.ce win32/makefile.mk win32/config_H.bc win32/config_H.gc win32/config_H.vc - wince/config_H.ce - wince/Makefile.ce + utils/Makefile + uconfig.h ); -system("chmod +w @writables"); +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 - wince/Makefile.ce - wince/compile-all.bat - wince/README.compile - wince/README.perlce - wince/registry.bat ); -system("perl -pi -e 's/\015*\012/\015\012/' @crlf"); +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"; + +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; + } +}