In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f86a0b8d0d5fbfb3d8ff4a3301f82c6912bb49ee?hp=46e4e78b248dcd435e4df8df789a65f8a29d0e6a>
- Log ----------------------------------------------------------------- commit f86a0b8d0d5fbfb3d8ff4a3301f82c6912bb49ee Author: David Mitchell <[email protected]> Date: Fri Jul 3 23:24:50 2009 +0100 bump attrs version to distiguish it from 5.10.0 (attrs has been removed from blead, which is why this is being done directly to maint) M ext/attrs/attrs.pm commit f74cb191f531cb42fa49215dc79df79336a3015c Author: David Mitchell <[email protected]> Date: Fri Jul 3 23:18:45 2009 +0100 down-bump some non-dual-life module versions: followup to cherry-pick of 438ec3d083eb1eea26cc4a6b8a3446af3b8cfccd, where there are differences between 5.10/0/5.8.9, maint and bleed, and bleed is two version increments ahead of 5.10.0; make maint one ahead. M ext/Socket/Socket.pm M lib/Term/ReadLine.pm M lib/overload.pm commit 438ec3d083eb1eea26cc4a6b8a3446af3b8cfccd Author: David Mitchell <[email protected]> Date: Fri Jul 3 22:53:42 2009 +0100 bump versions of non-dual-life modules that * differ between 5.10.0 and maint-5.10, or * differ between 5.8.9 and maint-5.10 (cherry-picked from commit af048c18889d4232ba48aa87bdd20a2320723b43) M ext/B/B/Xref.pm M ext/NDBM_File/NDBM_File.pm M ext/Socket/Socket.pm M lib/Benchmark.pm M lib/Carp.pm M lib/DB.pm M lib/DirHandle.pm M lib/Dumpvalue.pm M lib/File/Compare.pm M lib/FileHandle.pm M lib/I18N/Collate.pm M lib/PerlIO.pm M lib/SelectSaver.pm M lib/Term/ReadLine.pm M lib/UNIVERSAL.pm M lib/charnames.pm M lib/open.pm M lib/overload.pm commit 27395e5492e01aab57182cb258f6f1da1948dda9 Author: David Mitchell <[email protected]> Date: Fri Jul 3 22:09:59 2009 +0100 make cmpVERSION.pl ignore Config.pm (cherry picked from commit 7536d879835346ee8671a43b3f9e0bf5a70ad7c3) M Porting/cmpVERSION.pl commit 5baa9c28c25e0918f3e3c5b49809613fcaa5038c Author: David Mitchell <[email protected]> Date: Fri Jul 3 21:31:15 2009 +0100 add -x option to Porting/cmpVERSION.pl which ignores dual-life modules (cherry picked from commit 2fb8ff88df68d4456db591e74fa6d6cb7c777e3c) M Porting/cmpVERSION.pl ----------------------------------------------------------------------- Summary of changes: Porting/cmpVERSION.pl | 30 +++++++++++++++++++++++++----- ext/B/B/Xref.pm | 2 +- ext/NDBM_File/NDBM_File.pm | 2 +- ext/Socket/Socket.pm | 2 +- ext/attrs/attrs.pm | 2 +- lib/Benchmark.pm | 2 +- lib/Carp.pm | 2 +- lib/DB.pm | 2 +- lib/DirHandle.pm | 2 +- lib/Dumpvalue.pm | 2 +- lib/File/Compare.pm | 2 +- lib/FileHandle.pm | 2 +- lib/I18N/Collate.pm | 2 +- lib/PerlIO.pm | 2 +- lib/SelectSaver.pm | 2 +- lib/Term/ReadLine.pm | 2 +- lib/UNIVERSAL.pm | 2 +- lib/charnames.pm | 2 +- lib/open.pm | 2 +- lib/overload.pm | 2 +- 20 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl index 0f808c8..8f908c8 100644 --- a/Porting/cmpVERSION.pl +++ b/Porting/cmpVERSION.pl @@ -4,7 +4,10 @@ # cmpVERSION - compare two Perl source trees for modules # that have identical version numbers but different contents. # -# withg -d option, output the diffs too +# with -d option, output the diffs too +# with -x option, exclude dual-life modules (after all, there are tools +# like core-cpan-diff that can already deal with them) +# With this option, one od the directories must be '.'. # # Original by [email protected], modified by jhi. # @@ -17,14 +20,17 @@ use File::Find; use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir); use Getopt::Std; +use lib 'Porting'; +use Maintainers; + sub usage { die <<'EOF'; -usage: $0 [ -d ] source_dir1 source_dir2 +usage: $0 [ -d -x ] source_dir1 source_dir2 EOF } my %opts; -getopts('d', \%opts) or usage; +getopts('dx', \%opts) or usage; @ARGV == 2 or usage; for (@ARGV[0, 1]) { @@ -32,6 +38,18 @@ for (@ARGV[0, 1]) { unless -f catfile($_, "perl.h") && -d catdir($_, "Porting"); } +my %dual_files; +if ($opts{x}) { + die "With -x, one of the directories must be '.'\n" + unless $ARGV[0] eq '.' or $ARGV[1] eq '.'; + for my $m (grep $Maintainers::Modules{$_}{CPAN}, + keys %Maintainers::Modules) + { + + $dual_files{"./$_"} = 1 for Maintainers::get_module_files($m); + } +} + my $dir2 = rel2abs($ARGV[1]); chdir $ARGV[0] or die "$0: chdir '$ARGV[0]' failed: $!\n"; @@ -40,8 +58,9 @@ chdir $ARGV[0] or die "$0: chdir '$ARGV[0]' failed: $!\n"; my %skip; @skip{ './lib/Carp/Heavy.pm', + './lib/Config.pm', # no version number but contents will vary './lib/Exporter/Heavy.pm', - './win32/FindExt.pm' + './win32/FindExt.pm', } = (); my $skip_dirs = qr|^\./t/lib|; @@ -50,7 +69,8 @@ my @diffs; find( sub { /\.pm$/ && $File::Find::dir !~ $skip_dirs && - ! exists $skip{$File::Find::name} + ! exists $skip{$File::Find::name} && + ! exists $dual_files{$File::Find::name} && do { my $file2 = catfile(catdir($dir2, $File::Find::dir), $_); diff --git a/ext/B/B/Xref.pm b/ext/B/B/Xref.pm index 28bd74c..64e677c 100644 --- a/ext/B/B/Xref.pm +++ b/ext/B/B/Xref.pm @@ -1,6 +1,6 @@ package B::Xref; -our $VERSION = '1.01'; +our $VERSION = '1.02'; =head1 NAME diff --git a/ext/NDBM_File/NDBM_File.pm b/ext/NDBM_File/NDBM_File.pm index b88e657..3183395 100644 --- a/ext/NDBM_File/NDBM_File.pm +++ b/ext/NDBM_File/NDBM_File.pm @@ -7,7 +7,7 @@ require Tie::Hash; use XSLoader (); our @ISA = qw(Tie::Hash); -our $VERSION = "1.07"; +our $VERSION = "1.08"; XSLoader::load 'NDBM_File', $VERSION; diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm index ad5e618..0ceaf7c 100644 --- a/ext/Socket/Socket.pm +++ b/ext/Socket/Socket.pm @@ -1,7 +1,7 @@ package Socket; our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = "1.81"; +$VERSION = "1.82"; =head1 NAME diff --git a/ext/attrs/attrs.pm b/ext/attrs/attrs.pm index c483cd3..3c00f61 100644 --- a/ext/attrs/attrs.pm +++ b/ext/attrs/attrs.pm @@ -1,7 +1,7 @@ package attrs; use XSLoader (); -$VERSION = "1.02"; +$VERSION = "1.03"; =head1 NAME diff --git a/lib/Benchmark.pm b/lib/Benchmark.pm index 19a0343..269674c 100644 --- a/lib/Benchmark.pm +++ b/lib/Benchmark.pm @@ -440,7 +440,7 @@ our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION); clearcache clearallcache disablecache enablecache); %EXPORT_TAGS=( all => [ @EXPORT, @EXPORT_OK ] ) ; -$VERSION = 1.10; +$VERSION = 1.11; # --- ':hireswallclock' special handling diff --git a/lib/Carp.pm b/lib/Carp.pm index 6fb36a9..c06f949 100644 --- a/lib/Carp.pm +++ b/lib/Carp.pm @@ -1,6 +1,6 @@ package Carp; -our $VERSION = '1.10'; +our $VERSION = '1.11'; # this file is an utra-lightweight stub. The first time a function is # called, Carp::Heavy is loaded, and the real short/longmessmess_jmp # subs are installed diff --git a/lib/DB.pm b/lib/DB.pm index 7950f65..efb9035 100644 --- a/lib/DB.pm +++ b/lib/DB.pm @@ -41,7 +41,7 @@ BEGIN { $DB::subname = ''; # currently executing sub (fullly qualified name) $DB::lineno = ''; # current line number - $DB::VERSION = $DB::VERSION = '1.01'; + $DB::VERSION = $DB::VERSION = '1.02'; # initialize private globals to avoid warnings diff --git a/lib/DirHandle.pm b/lib/DirHandle.pm index 757bf4b..fc27dfb 100644 --- a/lib/DirHandle.pm +++ b/lib/DirHandle.pm @@ -1,6 +1,6 @@ package DirHandle; -our $VERSION = '1.02'; +our $VERSION = '1.03'; =head1 NAME diff --git a/lib/Dumpvalue.pm b/lib/Dumpvalue.pm index d5d93c7..88e1493 100644 --- a/lib/Dumpvalue.pm +++ b/lib/Dumpvalue.pm @@ -1,7 +1,7 @@ use 5.006_001; # for (defined ref) and $#$v and our package Dumpvalue; use strict; -our $VERSION = '1.12'; +our $VERSION = '1.13'; our(%address, $stab, @stab, %stab, %subs); # documentation nits, handle complex data structures better by chromatic diff --git a/lib/File/Compare.pm b/lib/File/Compare.pm index 7418fe6..05e1c41 100644 --- a/lib/File/Compare.pm +++ b/lib/File/Compare.pm @@ -7,7 +7,7 @@ our($VERSION, @ISA, @EXPORT, @EXPORT_OK, $Too_Big); require Exporter; -$VERSION = '1.1005'; +$VERSION = '1.1006'; @ISA = qw(Exporter); @EXPORT = qw(compare); @EXPORT_OK = qw(cmp compare_text); diff --git a/lib/FileHandle.pm b/lib/FileHandle.pm index b609614..6b3636a 100644 --- a/lib/FileHandle.pm +++ b/lib/FileHandle.pm @@ -4,7 +4,7 @@ use 5.006; use strict; our($VERSION, @ISA, @EXPORT, @EXPORT_OK); -$VERSION = "2.01"; +$VERSION = "2.02"; require IO::File; @ISA = qw(IO::File); diff --git a/lib/I18N/Collate.pm b/lib/I18N/Collate.pm index 257390f..decc86c 100644 --- a/lib/I18N/Collate.pm +++ b/lib/I18N/Collate.pm @@ -1,7 +1,7 @@ package I18N::Collate; use strict; -our $VERSION = '1.00'; +our $VERSION = '1.01'; =head1 NAME diff --git a/lib/PerlIO.pm b/lib/PerlIO.pm index 980df2c..f4a0197 100644 --- a/lib/PerlIO.pm +++ b/lib/PerlIO.pm @@ -1,6 +1,6 @@ package PerlIO; -our $VERSION = '1.05'; +our $VERSION = '1.06'; # Map layer name to package that defines it our %alias; diff --git a/lib/SelectSaver.pm b/lib/SelectSaver.pm index f0900a5..b67adff 100644 --- a/lib/SelectSaver.pm +++ b/lib/SelectSaver.pm @@ -1,6 +1,6 @@ package SelectSaver; -our $VERSION = '1.01'; +our $VERSION = '1.02'; =head1 NAME diff --git a/lib/Term/ReadLine.pm b/lib/Term/ReadLine.pm index d251271..a8116af 100644 --- a/lib/Term/ReadLine.pm +++ b/lib/Term/ReadLine.pm @@ -303,7 +303,7 @@ sub get_line { package Term::ReadLine; # So late to allow the above code be defined? -our $VERSION = '1.03'; +our $VERSION = '1.04'; my ($which) = exists $ENV{PERL_RL} ? split /\s+/, $ENV{PERL_RL} : undef; if ($which) { diff --git a/lib/UNIVERSAL.pm b/lib/UNIVERSAL.pm index 891c784..3a7b53e 100644 --- a/lib/UNIVERSAL.pm +++ b/lib/UNIVERSAL.pm @@ -1,6 +1,6 @@ package UNIVERSAL; -our $VERSION = '1.04'; +our $VERSION = '1.05'; # UNIVERSAL should not contain any extra subs/methods beyond those # that it exists to define. The use of Exporter below is a historical diff --git a/lib/charnames.pm b/lib/charnames.pm index b8eb2b4..0acae61 100644 --- a/lib/charnames.pm +++ b/lib/charnames.pm @@ -2,7 +2,7 @@ package charnames; use strict; use warnings; use File::Spec; -our $VERSION = '1.06'; +our $VERSION = '1.07'; use bytes (); # for $bytes::hint_bits diff --git a/lib/open.pm b/lib/open.pm index 1d1c0c7..a6b4250 100644 --- a/lib/open.pm +++ b/lib/open.pm @@ -1,7 +1,7 @@ package open; use warnings; -our $VERSION = '1.06'; +our $VERSION = '1.07'; require 5.008001; # for PerlIO::get_layers() diff --git a/lib/overload.pm b/lib/overload.pm index f1df27f..b48cae2 100644 --- a/lib/overload.pm +++ b/lib/overload.pm @@ -1,6 +1,6 @@ package overload; -our $VERSION = '1.06'; +our $VERSION = '1.07'; sub nil {} -- Perl5 Master Repository
