In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/add0c32f941ff4c1fa66201c1580b6bf19e8502f?hp=a367bf70201e6d953f50e9e8ccc8b728e52469f0>
- Log ----------------------------------------------------------------- commit add0c32f941ff4c1fa66201c1580b6bf19e8502f Author: David Mitchell <[email protected]> Date: Tue Jul 7 18:54:43 2009 +0100 today's merging activity M Porting/mergelog M pod/perl5101delta.pod commit dcf09c171134831b38f191afc587fcca172dffed Author: David Mitchell <[email protected]> Date: Tue Jul 7 18:48:36 2009 +0100 some fixes to makerel: * add cmd-line switches * make ExtUtils::Manifest silent * remove some autogenerated files from the fixup list (cherry picked from commit 5f244db984d907853a5bd0b598472da074dc2c8d) M Porting/makerel ----------------------------------------------------------------------- Summary of changes: Porting/makerel | 23 +++++++++++-- Porting/mergelog | 38 +++++++++++----------- pod/perl5101delta.pod | 86 +++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 117 insertions(+), 30 deletions(-) diff --git a/Porting/makerel b/Porting/makerel index b197a24..b126164 100644 --- a/Porting/makerel +++ b/Porting/makerel @@ -10,9 +10,25 @@ # 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 ] + -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) +EOF + +my %opts; +getopts('r: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"; @@ -37,6 +53,8 @@ $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"; @@ -120,9 +138,6 @@ my @writables = qw( global.sym overload.c overload.h - pod/perlintern.pod - pod/perlapi.pod - pod/perltoc.pod perlapi.h perlapi.c ext/Devel-PPPort/module2.c diff --git a/Porting/mergelog b/Porting/mergelog index f08f069..9ea6765 100644 --- a/Porting/mergelog +++ b/Porting/mergelog @@ -3205,14 +3205,8 @@ M abba722db5 2009/05/31 wrap some long FILES fields in Maintainers.pl M c494f1f448 2009/05/31 Fix casting warning d d22862789d 2009/05/31 Auto-complete lexicals in the debugger shell M 20f91e418d 2009/05/31 Mention Devel::NYTProf in perldebug -! 5bdf71cc92 2009/06/01 Upgrade to ExtUtils::MakeMaker 6.52 - wait for MM 6.54 ?? - then also merge: - 5bc8648cf6 - 9a7d94ef19 - ee0ea5142b -! 5bc8648cf6 2009/06/01 Add test boilerplate to the new MakeMaker tests - wait for MM 6.54 ?? +M 5bdf71cc92 2009/06/01 Upgrade to ExtUtils::MakeMaker 6.52 +M 5bc8648cf6 2009/06/01 Add test boilerplate to the new MakeMaker tests M c6ebb5120d 2009/06/01 Minor doc fix for the smart table legend (clarify M ee18cc6c23 2009/06/01 Smart-match perldelta adjustments (merged by hand into perl5101delta.pod rather @@ -3225,12 +3219,12 @@ d 58da6fbcb8 2009/06/01 Add benchmark test for keys() on empty hashes (RT2 M 0106d5186f 2009/06/02 resync some files with their CPAN equivalents (jus M f09dbad6e7 2009/06/02 start adding new EXCLUDED and MAP entries to Maint M 0e945d0082 2009/06/02 stop git whining about trailing whitespace (picky -! 9a7d94ef19 2009/06/02 Merge branch 'eumm652' into blead +R 9a7d94ef19 2009/06/02 Merge branch 'eumm652' into blead MERGE: 0e945d0082 5bc8648cf6 - wait for MM 6.54 ?? + individual components cherry-picked R abf6c2ea23 2009/06/02 Merge branch 'smartmatch' into blead MERGE: 9a7d94ef19 532217f118 -! ee0ea5142b 2009/06/02 Adjust MANIFEST +M ee0ea5142b 2009/06/02 Adjust MANIFEST d 9eb4ebd161 2009/06/02 In Perl_hv_iternext_flags(), clarify and generalis M ab45a0fa26 2009/06/02 Disentangling -g and -DDEBUGGING is a TODO. M 5988ef3d51 2009/06/02 parenthesize check for a flag @@ -3263,7 +3257,7 @@ d c8be058c40 2009/06/04 Assuming that $SIG{PIPE} is not set can be bogus w ! 1be14c39f7 2009/06/04 Correctly interpolate the attempted permissions as more File::Copy stuff M 30e682852b 2009/06/04 vms.c EFS logical name fix. -! 8415bfe009 2009/06/04 MakeMaker must handle an empty $self->{LIBS} array +M 8415bfe009 2009/06/04 MakeMaker must handle an empty $self->{LIBS} array M 50255d58c0 2009/06/04 Test case to go with 30e682852bf42358156ed62e06e91 d 422c59bf48 2009/06/04 Fix my comment about DB::sub and make it DB::DB M e8b9ce6006 2009/06/05 [perl #9328] Update INSTALL example for BerkeleyDB @@ -3289,8 +3283,8 @@ d 26618b64e8 2009/06/07 Bump version of threads.pm d 7dcc656fa9 2009/06/07 Add a test for a thread-enabled debugger M a39e16d8bc 2009/06/07 Upgrade to Test-Harness-3.17 d d2aa556d1d 2009/06/07 There is no pthread_sigmask on VMS, so use sigproc -! c095625522 2009/06/08 Upgrade to MakeMaker 6.53_02 -! e39d780342 2009/06/08 Add missing test boilerplates to new MakeMaker tes +M c095625522 2009/06/08 Upgrade to MakeMaker 6.53_02 +M e39d780342 2009/06/08 Add missing test boilerplates to new MakeMaker tes d d7dfc388e0 2009/06/08 fix RT 39060, errno incorrectly set in perlio see also fcac5cf149 M 3c2847f4f8 2009/06/08 Upgrade NEXT to 0.64. @@ -3319,7 +3313,7 @@ d 26e8050aaf 2009/06/10 [perl #66452] TMPDIR not honored when opening an a see also 0b99e9860e R 454dbe4084 2009/06/10 Merge branch 'blead' of ssh://[email protected] MERGE: 26e8050aaf 12c541f435 -! 75b0fd110a 2009/06/10 remove from blead, some files already removed from +M 75b0fd110a 2009/06/10 remove from blead, some files already removed from M 8bc7f08e00 2009/06/10 update comment in overload.pl following 813720522f M 92a24ac3df 2009/06/10 Small typo in example. d 0b99e9860e 2009/06/10 Do not honor TMPDIR for anonymous temporary files @@ -3560,8 +3554,14 @@ M ab6722ad2c 2009/07/06 sync ExtUtils::CBuilder with CPAM M e7d8bd5654 2009/07/06 sync Module::Build with CPAN M 95e016b968 2009/07/06 bump autodie veresion in Maintainers.pl M cceec05296 2009/07/06 Maintainers.pl: Explanation as to why autodie test -. 3e887aae38 2009/07/06 update to Test::Simple 0.92 -. 45d8b36ec0 2009/07/06 add core boilerplate to three new Test::Simple tes +M 3e887aae38 2009/07/06 update to Test::Simple 0.92 +M 45d8b36ec0 2009/07/06 add core boilerplate to three new Test::Simple tes M b7bed276c4 2009/07/06 clarify usage of Porting/Maintainers -. b36de39969 2009/07/06 re-add Test::Simple exclude accidentally removed d -. b074547015 2009/07/06 Don't dump autodie from core (was Re: Coring Varia +M b36de39969 2009/07/06 re-add Test::Simple exclude accidentally removed d +M b074547015 2009/07/06 Don't dump autodie from core (was Re: Coring Varia +M 84d2fa142c 2009/07/06 Regex fails when string is too long +M 75e3c8a32e 2009/07/06 upgrade to ExtUtils::MakeMaker 6.53_03 +M 58118e0c79 2009/07/07 limit what add-package.pl might try to delete +M 56bfbabc02 2009/07/07 rebump Hash::Util::FieldHash from 1.03_01 to 1.04 +M 8bc57f96f9 2009/07/07 update to CPANPLUS 0.88 +M 5f244db984 2009/07/07 some fixes to makerel: diff --git a/pod/perl5101delta.pod b/pod/perl5101delta.pod index c5717a5..0e22b4a 100644 --- a/pod/perl5101delta.pod +++ b/pod/perl5101delta.pod @@ -209,6 +209,10 @@ L<TAP::Harness> needs to be able to schedule individual non-conflicting test scripts itself, and there is no standard interface to C<make> utilities to interact with their job schedulers. +Note that currently some test scripts may fail when run in parallel (most +notably C<ext/IO/t/io_dir.t>). If necessary run just the failing scripts +again sequentially and see if the failures go away. + XXX do we now have dtrace? =head2 Support for C<configure_requires> in CPAN module metadata @@ -255,6 +259,10 @@ C<Parse::CPAN::Meta> has been added to the core (version 1.39). upgraded from version 0.08 to 0.09. +=item C<attrs> + +upgraded from version 1.02 to 1.03. + =item C<base> upgraded from version 2.13 to 2.14. See L<parent> for a replacement. @@ -273,6 +281,8 @@ upgraded from version 0.22 to 0.23 =item C<charnames> +upgraded from version 1.06 to 1.07 + The Unicode NameAliases.txt database file has been added. This has the effect of adding some extra C<\N> character names that formerly wouldn't have been recognised; for example, C<"\N{LATIN CAPITAL LETTER GHA}">. @@ -299,6 +309,14 @@ were no functional changes) upgraded from version 0.5565 to 0.62 +=item C<open> + +upgraded from version 1.06 to 1.07 + +=item C<overload> + +upgraded from version 1.06 to 1.07 + =item C<overloading> See L</"The C<overloading> pragma"> above. @@ -351,7 +369,15 @@ C<B::Lint> upgraded from version 1.09 to 1.11 =item * -C<Carp> upgraded from version 1.08 to 1.10 +C<B::Xref> upgraded from version 1.01 to 1.02 + +=item * + +C<Benchmark> upgraded from version 1.10 to 1.11 + +=item * + +C<Carp> upgraded from version 1.08 to 1.11 =item * @@ -367,7 +393,7 @@ C<CPAN> upgraded from version 1.9205 to 1.9402 =item * -C<CPANPLUS> upgraded from version 0.84 to 0.87_03 +C<CPANPLUS> upgraded from version 0.84 to 0.88 =item * @@ -387,6 +413,10 @@ C<Devel::PPPort> upgraded from version 3.13 to 3.19 =item * +C<DB> upgraded from version 1.01 to 1.02 + +=item * + C<DB_File> upgraded from version 1.816_1 to 1.820 =item * @@ -399,12 +429,15 @@ C<Digest::SHA> upgraded from version 5.45 to 5.47 =item * -C<DirHandle> upgraded from version 1.01 to 1.02 +C<DirHandle> upgraded from version 1.01 to 1.03 + +=item * + +C<Dumpvalue> upgraded from version 1.12 to 1.13 =item * C<Dynaloader> upgraded from version 1.09 to 1.10 -bleed/maint =item * @@ -441,7 +474,10 @@ C<ExtUtils::Install> upgraded from version 1.44 to 1.52 =item * -C<ExtUtils::MakeMaker> upgraded from version 6.42 to 6.50 +C<ExtUtils::MakeMaker> upgraded from version 6.42 to 6.53_03 + +Note that C<ExtUtils::MakeMaker::bytes> and C<ExtUtils::MakeMaker::vmsish> +have been removed from this distribution. =item * @@ -462,6 +498,10 @@ C<File::Basename> upgraded from version 2.76 to 2.77 =item * +C<File::Compare> upgraded from version 1.1005 to 1.1006 + +=item * + C<File::Copy> upgraded from version 2.11 to 2.14 =item * @@ -494,6 +534,10 @@ C<FileCache> upgraded from version 1.07 to 1.08 =item * +C<FileHandle> upgraded from version 2.01 to 2.02 + +=item * + C<Filter::Simple> upgraded from version 0.82 to 0.84 =item * @@ -514,11 +558,15 @@ C<Getopt::Long> upgraded from version 2.37 to 2.38 =item * -C<Hash::Util::FieldHash> upgraded from version 1.03 to 1.03_01. XXX +C<Hash::Util::FieldHash> upgraded from version 1.03 to 1.04. This fixes a memory leak. =item * +C<I18N::Collate> upgraded from version 1.00 to 1.01 + +=item * + C<IO> upgraded from version 1.23_01 to 1.25 This makes non-blocking mode work on Windows in IO::Socket::INET [CPAN #43573]. @@ -625,6 +673,10 @@ C<Module::Pluggable> upgraded from version 3.6 to 3.9 =item * +C<NDBM_File> upgraded from version 1.07 to 1.08 + +=item * + C<Net::Ping> upgraded from version 2.33 to 2.36 =item * @@ -645,6 +697,10 @@ C<Package::Constants> upgraded from version 0.01 to 0.02 =item * +C<PerlIO> upgraded from version 1.04 to 1.06 + +=item * + C<PerlIO::via> upgraded from version 0.04 to 0.07 =item * @@ -677,10 +733,18 @@ C<Scalar::Util> upgraded from version 1.19 to 1.21 =item * +C<SelectSaver> upgraded from 1.01 to 1.02 + +=item * + C<SelfLoader> upgraded from 1.11 to 1.17 =item * +C<Socket> upgraded from 1.80 to 1.82 + +=item * + C<Storable> upgraded from 2.18 to 2.20 =item * @@ -709,6 +773,10 @@ C<Term::ANSIColor> upgraded from version 1.12 to 2.00 =item * +C<Term::ReadLine> upgraded from version 1.03 to 1.04 + +=item * + C<Term::UI> upgraded from version 0.18 to 0.20 =item * @@ -724,7 +792,7 @@ removed. If you still need this, then they are available in the =item * -C<Test::Simple> upgraded from version 0.72 to 0.86_01 XXX not a CPAN release +C<Test::Simple> upgraded from version 0.72 to 0.92 =item * @@ -786,6 +854,10 @@ The documentation has been corrected and expanded. =item * +C</UNIVERSAL> upgraded from version 1.04 to version 1.05 + +=item * + C<Win32> upgraded from version 0.34 to version 0.39 =item * -- Perl5 Master Repository
