In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/3e16405ac1c32a3222d76ff46dca7df3cf7de0aa?hp=441695c09aebf58c88b0c9d0c42600fae89ce436>
- Log ----------------------------------------------------------------- commit 3e16405ac1c32a3222d76ff46dca7df3cf7de0aa Author: H.Merijn Brand - Tux <[email protected]> Date: Sat May 14 18:32:23 2016 +0200 Confused? You won't be after the next version of pigs in space I had to think about what the letters meant on every command, so they were not logical enough. Now with comments in --help M ls-diff.pl commit b9807b5fe3f4c97fa34e19b8a9b265f91f0e4aca Author: H.Merijn Brand - Tux <[email protected]> Date: Sat May 14 18:30:03 2016 +0200 Merged changes to Finish.U M U/modified/Finish.U M dist/U/Finish.U ----------------------------------------------------------------------- Summary of changes: U/modified/Finish.U | 15 +++++++-------- dist/U/Finish.U | 6 +++--- ls-diff.pl | 46 +++++++++++++++++++++++++++++++--------------- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/U/modified/Finish.U b/U/modified/Finish.U index 295bdb0..cf5a364 100644 --- a/U/modified/Finish.U +++ b/U/modified/Finish.U @@ -1,12 +1,12 @@ -?RCS: $Id: Finish.U,v 3.0.1.6 1995/02/15 14:09:30 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic License, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic License; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: Finish.U,v $ ?RCS: Revision 3.0.1.6 1995/02/15 14:09:30 ram @@ -43,8 +43,8 @@ : Finish up by extracting the .SH files case "$alldone" in exit) - $rm -rf UU - echo "Extraction done." +?X: They supplied the -E switch + echo "Stopping at your request, leaving temporary files around." exit 0 ;; cont) @@ -124,11 +124,10 @@ the policy defaults. EOM fi -if $test -f config.msg; then +if $test -f UU/config.msg; then echo "Hmm. I also noted the following information while running:" echo " " - $cat config.msg >&4 - $rm -f config.msg + $cat UU/config.msg >&4 fi ?X: ?X: kit*isdone files are left over by shell archives built using the makedist diff --git a/dist/U/Finish.U b/dist/U/Finish.U index 80399de..12f776c 100644 --- a/dist/U/Finish.U +++ b/dist/U/Finish.U @@ -43,8 +43,8 @@ : Finish up by extracting the .SH files case "$alldone" in exit) - $rm -rf UU - echo "Extraction done." +?X: They supplied the -E switch + echo "Stopping at your request, leaving temporary files around." exit 0 ;; cont) @@ -74,7 +74,7 @@ esac ?X: ?X: Turn silent mode off from now on (we want a verbose file extraction). -?X: This means we have to explicitely test for '$silent' from now on to +?X: This means we have to explicitly test for '$silent' from now on to ?X: strip off any verbose messages. ?X: echo " " diff --git a/ls-diff.pl b/ls-diff.pl index 8621bd4..acc7b2b 100755 --- a/ls-diff.pl +++ b/ls-diff.pl @@ -3,11 +3,15 @@ use 5.18.2; use warnings; -our $VERSION = "0.01"; +our $VERSION = "0.02"; sub usage { my $err = shift and select STDERR; - say "usage: $0 [--list] [--diff]"; + say "usage: $0 [--list] [--diff[=gd|dp|gp]]"; + say " diff (size) between git / dist / perl"; + say " where git (g) is the version from the git repo of meta/dist"; + say " where dist (d) is the unmodified installed version from dist"; + say " where perl (p) is the *modified* version for use with perl"; exit $err; } # usage @@ -28,9 +32,9 @@ $pat = qr{$pat}; my %m; -foreach my $u ( [ "d", "dist/U" ], - [ "m", "U" ], - [ "g", "dist-git/mcon/U" ], +foreach my $u ( [ "g", "dist-git/mcon/U" ], + [ "d", "dist/U" ], + [ "p", "U" ], ) { my ($t, $dir) = @$u; find (sub { @@ -48,26 +52,38 @@ foreach my $u ( [ "d", "dist/U" ], }, $dir); } +foreach my $u (keys %m) { + my $g = $m{$u}{g}; + my $d = $m{$u}{d}; + my $p = $m{$u}{p}; + + $m{$u}{gd} = $g && $d ? length diff (\$g->{unit}, \$d->{unit}) : 0; + $m{$u}{dp} = $d && $p ? length diff (\$d->{unit}, \$p->{unit}) : 0; + $m{$u}{gp} = $g && $p ? length diff (\$g->{unit}, \$p->{unit}) : 0; + } + $opt_d //= ""; say " # Git Dist Perl Diff Unit"; say "=== ========= ====== ========= ====== ========= ====== ======================"; my $i = 1; -foreach my $u (sort keys %m) { +foreach my $u (sort { $m{$b}{gd} <=> $m{$a}{gd} || $m{$b}{dp} <=> $m{$a}{dp} } keys %m) { my $d = $m{$u}{d} or next; - my $m = $m{$u}{m} or next; + my $p = $m{$u}{p} or next; my $g = $m{$u}{g} or next; - my $gd = length diff (\$g->{unit}, \$d->{unit}); - my $dm = length diff (\$d->{unit}, \$m->{unit}); - my $gm = length diff (\$g->{unit}, \$m->{unit}); + my $gd = $m{$u}{gd}; + my $dp = $m{$u}{dp}; + my $gp = $m{$u}{gp}; + + #$gd == 0 || $gd > 1000 and next; printf "%3d %5d/%3d %6d %5d/%3d %6d %5d/%3d %6d %s\n", $i++, $g->{size}, $g->{lines}, $gd, - $d->{size}, $d->{lines}, $dm, - $m->{size}, $m->{lines}, $gm, + $d->{size}, $d->{lines}, $dp, + $p->{size}, $p->{lines}, $gp, $u; - $opt_l and say " $m{$u}{$_}{dir}/$u" for qw( g d m ); + $opt_l and say " $_ $m{$u}{$_}{dir}/$u" for qw( g d p ); extdiff ($u, sort split // => $opt_d); } @@ -79,9 +95,9 @@ sub extdiff { my $t = $m{$u}{$to} or return; my %tag = ( - d => "dst", g => "git", - m => "mod", + d => "dst", + p => "prl", ); my $F = $tag{$from}; my $T = $tag{$to}; -- perl5 metaconfig repository
