Remove reference to obsolete threads version in Porting/cmpVERSION.pl

[perl5.git] / Porting / cmpVERSION.pl

diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl
index ebf57cf..37017cf 100755 (executable)
--- a/Porting/cmpVERSION.pl
+++ b/Porting/cmpVERSION.pl
@@ -32,15 +32,28 @@ unless (GetOptions('diffs' => \$diffs,
 die "$0: This does not look like a Perl directory\n"
     unless -f "perl.h" && -d "Porting";
 die "$0: 'This is a Perl directory but does not look like Git working directory\n"
-    unless -d ".git";
+    unless (-d ".git" || (exists $ENV{GIT_DIR} && -d $ENV{GIT_DIR}));
 
 my $null = devnull();
 
 unless (defined $tag_to_compare) {
+    my $check = 'HEAD';
+    while(1) {
+        $check = `git describe --abbrev=0 $check 2>$null`;
+        chomp $check;
+        last unless $check =~ /-RC/;
+        $check .= '^';
+    }
+    $tag_to_compare = $check;
     # Thanks to David Golden for this suggestion.
 
-    $tag_to_compare = `git describe --abbrev=0`;
-    chomp $tag_to_compare;
+}
+
+unless (length $tag_to_compare) {
+    die "$0: Git found, but no Git tags found\n"
+       unless $tap;
+    print "1..0 # SKIP: Git found, but no Git tags found\n";
+    exit 0;
 }
 
 my $tag_exists = `git --no-pager tag -l $tag_to_compare 2>$null`;
@@ -68,9 +81,12 @@ if ($exclude_upstream) {
 # usually because they pull in their version from some other file.
 my %skip;
 @skip{
+    'cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm', # just a test module
+    'cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm',  # just a test module
+    'dist/Attribute-Handlers/demo/MyClass.pm', # it's just demonstration code
+    'dist/Exporter/lib/Exporter/Heavy.pm',
     'lib/Carp/Heavy.pm',
     'lib/Config.pm',           # no version number but contents will vary
-    'lib/Exporter/Heavy.pm',
     'win32/FindExt.pm',
 } = ();
 
@@ -79,7 +95,6 @@ my %skip;
 
 my %skip_versions = (
           # 'some/sample/file.pm' => [ '1.23', '1.24' ],
-          'dist/threads/lib/threads.pm' => [ '1.83' ],
          );
 
 my $skip_dirs = qr|^t/lib|;
@@ -104,6 +119,7 @@ sub pm_file_from_xs {
                         # look for a .pm in lib/ based on that:
                         my ($path) = shift =~ m!^(.*)/!;
                         my ($last) = $path =~ m!([^/]+)\z!;
+                        $last = 'List-Util' if $last eq 'Scalar-List-Utils';
                         $last =~ tr !-!/!;
                         return "$path/lib/$last";
                     }) {
@@ -146,6 +162,7 @@ printf "1..%d\n" => scalar keys %module_diffs if $tap;
 
 my $count;
 my $diff_cmd = "git --no-pager diff $tag_to_compare ";
+my $q = ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') ? '"' : "'";
 my (@diff);
 
 foreach my $pm_file (sort keys %module_diffs) {
@@ -157,7 +174,8 @@ foreach my $pm_file (sort keys %module_diffs) {
     ++$count;
 
     if (!defined $orig_pm_version || $orig_pm_version eq 'undef') { # sigh
-        print "ok $count - SKIP Can't pass \$VERSION in $pm_file\n" if $tap;
+        print "ok $count - SKIP Can't parse \$VERSION in $pm_file\n"
+          if $tap;
     } elsif (!defined $pm_version || $pm_version eq 'undef') {
         print "not ok $count - in $pm_file version was $orig_pm_version, now unparsable\n" if $tap;
     } elsif ($pm_version ne $orig_pm_version) { # good
@@ -165,7 +183,7 @@ foreach my $pm_file (sort keys %module_diffs) {
     } else {
        if ($tap) {
            foreach (sort @{$module_diffs{$pm_file}}) {
-               print "# $_" for `$diff_cmd '$_'`;
+               print "# $_" for `$diff_cmd $q$_$q`;
            }
            if (exists $skip_versions{$pm_file}
                and grep $pm_version eq $_, @{$skip_versions{$pm_file}}) {
@@ -183,12 +201,14 @@ foreach my $pm_file (sort keys %module_diffs) {
 sub get_file_from_git {
     my ($file, $tag) = @_;
     local $/;
+
+    use open IN => ':raw';
     return scalar `git --no-pager show $tag:$file 2>$null`;
 }
 
 if ($diffs) {
     for (sort @diff) {
        print "\n";
-       system "$diff_cmd '$_'";
+       system "$diff_cmd $q$_$q";
     }
 }