In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/300da4a166907f431ffc399759e76770773a2007?hp=7916a4550fd18ad512e0420ffac716ce1ab89ee7>
- Log ----------------------------------------------------------------- commit 300da4a166907f431ffc399759e76770773a2007 Author: David Golden <[email protected]> Date: Mon Jul 19 16:10:37 2010 -0700 cmpVERSION.pl: don't flag version 'undef' M Porting/cmpVERSION.pl commit 7da24786ed66d9241cb264e8f77343fc46013666 Author: David Golden <[email protected]> Date: Mon Jul 19 15:53:29 2010 -0700 Bump module version numbers M ext/re/re.pm M lib/File/Copy.pm M lib/File/stat.pm M lib/Tie/Array.pm M lib/Unicode/UCD.pm commit f85d27e8aa9edfb9901885c8df1ed030caa36f22 Author: David Golden <[email protected]> Date: Mon Jul 19 14:55:58 2010 -0700 add link to smoke index M Porting/release_managers_guide.pod commit 5f92f74fae1c66867c70b091f18078258a092fb6 Author: David Golden <[email protected]> Date: Mon Jul 19 14:33:29 2010 -0700 core-cpan-diff: always use diff and ignore whitspace M Porting/core-cpan-diff commit 7134fed3278cb3b7c6af8c4bd3b896978b554b07 Author: David Golden <[email protected]> Date: Mon Jul 19 11:53:28 2010 -0700 core-cpan-diff: tidied and always show version mismatch M Porting/core-cpan-diff commit b1d0ee8cef28f3e6ceefbd47b34096798f7b21d8 Author: David Golden <[email protected]> Date: Mon Jul 19 10:05:12 2010 -0700 bump I18N::LangTags version to 0.35_01 M dist/I18N-LangTags/lib/I18N/LangTags.pm M dist/I18N-LangTags/lib/I18N/LangTags/List.pm ----------------------------------------------------------------------- Summary of changes: Porting/cmpVERSION.pl | 7 +-- Porting/core-cpan-diff | 52 +++++++++++++------------ Porting/release_managers_guide.pod | 1 + dist/I18N-LangTags/lib/I18N/LangTags.pm | 2 +- dist/I18N-LangTags/lib/I18N/LangTags/List.pm | 2 +- ext/re/re.pm | 2 +- lib/File/Copy.pm | 2 +- lib/File/stat.pm | 2 +- lib/Tie/Array.pm | 2 +- lib/Unicode/UCD.pm | 2 +- 10 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl index 9f013ef..9ba09e0 100644 --- a/Porting/cmpVERSION.pl +++ b/Porting/cmpVERSION.pl @@ -97,10 +97,9 @@ foreach my $pm_file (@module_diffs) { my $pm_version = eval {MM->parse_version($pm_file)}; my $orig_pm_content = get_file_from_git($pm_file, $tag_to_compare); my $orig_pm_version = eval {MM->parse_version(\$orig_pm_content)}; - next unless - defined $pm_version && - defined $orig_pm_version && - $pm_version eq $orig_pm_version; + next if ( ! defined $pm_version || ! defined $orig_pm_version ); + next if ( $pm_version eq 'undef' || $orig_pm_version eq 'undef' ); # sigh + next if $pm_version ne $orig_pm_version; push @output_files, $pm_file; push @output_diffs, $pm_file unless $pm_eq; push @output_diffs, $xs_file unless $xs_eq; diff --git a/Porting/core-cpan-diff b/Porting/core-cpan-diff index b169855..7594618 100755 --- a/Porting/core-cpan-diff +++ b/Porting/core-cpan-diff @@ -128,7 +128,7 @@ sub run { if ( $reverse || $use_diff || $diff_opts || $verbose ); } else { - $diff_opts = '-u' unless defined $diff_opts; + $diff_opts = '-u -b' unless defined $diff_opts; usage("can't use -f without --crosscheck") if $force; } @@ -256,14 +256,16 @@ sub do_compare { ( my $main_pm = $module ) =~ s{::}{/}g; $main_pm .= ".pm"; - my ( $excluded, $map, $customized) = get_map( $m, $module, \...@perl_files ); + my ( $excluded, $map, $customized ) = + get_map( $m, $module, \...@perl_files ); my %perl_unseen; @perl_unse...@perl_files} = (); my %perl_files = %perl_unseen; foreach my $cpan_file (@cpan_files) { - my $mapped_file = cpan_to_perl( $excluded, $map, $customized, $cpan_file ); + my $mapped_file = + cpan_to_perl( $excluded, $map, $customized, $cpan_file ); unless ( defined $mapped_file ) { print $outfh " Excluded: $cpan_file\n" if $verbose; next; @@ -318,26 +320,18 @@ EOF my $relative_mapped_file = $mapped_file; $relative_mapped_file =~ s/^(cpan|dist|ext)\/.*?\///; - for my $f ( catfile( 'lib', $main_pm ), File::Basename::basename($main_pm) ) { - next unless $f eq $relative_mapped_file; - my $pv = MM->parse_version($mapped_file) || '(unknown)'; - my $cv = MM->parse_version($abs_cpan_file) || '(unknown)'; - if ( $pv ne $cv ) { - print $outfh - " Version mismatch: $cv (cpan) vs $pv (perl)\n"; - } - } - - my $different = File::Compare::compare( $abs_cpan_file, $mapped_file ); - if ( $different && customized( $m, $relative_mapped_file) ) { + my $different = + file_diff( $outfh, $abs_cpan_file, $mapped_file, $reverse, + $diff_opts ); + if ( $different && customized( $m, $relative_mapped_file ) ) { if ($verbose) { print $outfh " Customized: $relative_mapped_file\n"; } } - elsif ( $different ) { + elsif ($different) { if ($use_diff) { - file_diff( $outfh, $abs_cpan_file, $mapped_file, $reverse, - $diff_opts ); + $different =~ s{^(--- |\+\+\+ )/tmp/[^/]+/}{$1}gm; + print $outfh $different; } else { if ( $cpan_file eq $relative_mapped_file ) { @@ -347,6 +341,16 @@ EOF print $outfh " Modified: $cpan_file $relative_mapped_file\n"; } + + if ( $cpan_file =~ m{\.pm\z} ) { + my $pv = MM->parse_version($mapped_file) || 'unknown'; + my $cv = MM->parse_version($abs_cpan_file) || 'unknown'; + if ( $pv ne $cv ) { + print $outfh +" Version mismatch in '$cpan_file':\n $cv (cpan) vs $pv (perl)\n"; + } + } + } } elsif ($verbose) { @@ -476,7 +480,7 @@ sub get_map { my ( $excluded, $map, $customized ) = @$m{qw(EXCLUDED MAP CUSTOMIZED)}; - $excluded ||= []; + $excluded ||= []; $customized ||= []; return $excluded, $map, $customized if $map; @@ -526,6 +530,7 @@ sub cpan_to_perl { for my $exclude (@$excluded) { next if $exclude ~~ $customized; + # may be a simple string to match exactly, or a pattern if ( ref $exclude ) { return if $cpan_file =~ $exclude; @@ -648,16 +653,13 @@ sub file_diff { else { push @cmd, $cpan_file, $perl_file; } - my $result = `...@cmd`; - - $result =~ s{^(--- |\+\+\+ )/tmp/[^/]+/}{$1}gm; + return `...@cmd`; - print $outfh $result; } sub customized { - my ($module_data, $file) = @_; - return grep { $file eq $_ } @{ $module_data->{CUSTOMIZED} }; + my ( $module_data, $file ) = @_; + return grep { $file eq $_ } @{ $module_data->{CUSTOMIZED} }; } run(); diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod index 2de3368..088df03 100644 --- a/Porting/release_managers_guide.pod +++ b/Porting/release_managers_guide.pod @@ -216,6 +216,7 @@ Ensure dual-life CPAN modules are stable, which comes down to: I<You MAY SKIP this step for SNAPSHOT> Similarly, monitor the smoking of core tests, and try to fix. +See L<http://doc.procura.nl/smoke/index.html> for a summary. =item * diff --git a/dist/I18N-LangTags/lib/I18N/LangTags.pm b/dist/I18N-LangTags/lib/I18N/LangTags.pm index 0bdc65f..efc12c2 100644 --- a/dist/I18N-LangTags/lib/I18N/LangTags.pm +++ b/dist/I18N-LangTags/lib/I18N/LangTags.pm @@ -19,7 +19,7 @@ require Exporter; ); %EXPORT_TAGS = ('ALL' => \...@export_ok); -$VERSION = "0.35"; +$VERSION = "0.35_01"; sub uniq { my %seen; return grep(!($seen{$_}++), @_); } # a util function diff --git a/dist/I18N-LangTags/lib/I18N/LangTags/List.pm b/dist/I18N-LangTags/lib/I18N/LangTags/List.pm index 5494bea..461bd4d 100644 --- a/dist/I18N-LangTags/lib/I18N/LangTags/List.pm +++ b/dist/I18N-LangTags/lib/I18N/LangTags/List.pm @@ -4,7 +4,7 @@ package I18N::LangTags::List; # Time-stamp: "2004-10-06 23:26:21 ADT" use strict; use vars qw(%Name %Is_Disrec $Debug $VERSION); -$VERSION = '0.35'; +$VERSION = '0.35_01'; # POD at the end. #---------------------------------------------------------------------- diff --git a/ext/re/re.pm b/ext/re/re.pm index d9fd912..9341feb 100644 --- a/ext/re/re.pm +++ b/ext/re/re.pm @@ -4,7 +4,7 @@ package re; use strict; use warnings; -our $VERSION = "0.11"; +our $VERSION = "0.12"; our @ISA = qw(Exporter); our @EXPORT_OK = ('regmust', qw(is_regexp regexp_pattern diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm index e14b01b..0f17e2b 100644 --- a/lib/File/Copy.pm +++ b/lib/File/Copy.pm @@ -22,7 +22,7 @@ sub syscopy; sub cp; sub mv; -$VERSION = '2.19'; +$VERSION = '2.20'; require Exporter; @ISA = qw(Exporter); diff --git a/lib/File/stat.pm b/lib/File/stat.pm index 3c16658..a783e08 100644 --- a/lib/File/stat.pm +++ b/lib/File/stat.pm @@ -10,7 +10,7 @@ BEGIN { *warnif = \&warnings::warnif } our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS); -our $VERSION = '1.02'; +our $VERSION = '1.03'; my @fields; BEGIN { diff --git a/lib/Tie/Array.pm b/lib/Tie/Array.pm index bfc1024..4e980a8 100644 --- a/lib/Tie/Array.pm +++ b/lib/Tie/Array.pm @@ -3,7 +3,7 @@ package Tie::Array; use 5.006_001; use strict; use Carp; -our $VERSION = '1.03'; +our $VERSION = '1.04'; # Pod documentation after __END__ below. diff --git a/lib/Unicode/UCD.pm b/lib/Unicode/UCD.pm index 67b5a8a..2c1f0e5 100644 --- a/lib/Unicode/UCD.pm +++ b/lib/Unicode/UCD.pm @@ -3,7 +3,7 @@ package Unicode::UCD; use strict; use warnings; -our $VERSION = '0.28'; +our $VERSION = '0.29'; use Storable qw(dclone); -- Perl5 Master Repository
