We shouldn't be changing perl version numbers in blead-isn't-upstream

[perl5.git] / Porting / bump-perl-version

diff --git a/Porting/bump-perl-version b/Porting/bump-perl-version
old mode 100755 (executable)
new mode 100644 (file)
index d7aabba..62ae47e
--- a/Porting/bump-perl-version
+++ b/Porting/bump-perl-version
@@ -71,7 +71,7 @@ EOF
 my %opts;
 getopts('csu', \%opts) or usage;
 if ($opts{u}) {
 my %opts;
 getopts('csu', \%opts) or usage;
 if ($opts{u}) {

-    @ARGV == 0 or usage('no version version numbers should be speciied');
+    @ARGV == 0 or usage('no version version numbers should be specified');

     # fake to stop warnings when calculating $oldx etc
     @ARGV = qw(99.99.99 99.99.99);
 }
     # fake to stop warnings when calculating $oldx etc
     @ARGV = qw(99.99.99 99.99.99);
 }


@@ -182,6 +182,14 @@ my @maps =  (
        qr/makedef|win32|hints/,      # makedef.pl, README.win32, win32/*, hints/*
     ],
 
        qr/makedef|win32|hints/,      # makedef.pl, README.win32, win32/*, hints/*
     ],
 

+    # microperl locations should be bumped for major versions
+    [
+        qr{(/)(\d\.\d{2})(["'/])},
+        sub { $2, "$1$newx.$newy$3" },
+        "$oldx.$oldy",
+        qr/uconfig/,
+    ],
+

 );
 
 
 );
 
 


@@ -190,12 +198,11 @@ my @maps =  (
 my %SKIP_FILES = map { ($_ => 1) } qw(
     Changes
     MANIFEST
 my %SKIP_FILES = map { ($_ => 1) } qw(
     Changes
     MANIFEST

+    Porting/epigraphs.pod

     Porting/how_to_write_a_perldelta.pod
     Porting/release_managers_guide.pod
     Porting/how_to_write_a_perldelta.pod
     Porting/release_managers_guide.pod

-       Porting/release_schedule.pod
+    Porting/release_schedule.pod

     Porting/bump-perl-version
     Porting/bump-perl-version

-    Porting/mergelog
-    Porting/mergelog-tool

     pod.lst
     pp_ctl.c
 );
     pod.lst
     pp_ctl.c
 );


@@ -203,6 +210,7 @@ my @SKIP_DIRS = qw(
     ext
     lib
     pod
     ext
     lib
     pod

+    cpan

     t
 );
 
     t
 );
 


@@ -217,7 +225,7 @@ elsif ($opts{u}) {
     do_update();
 }
 else {
     do_update();
 }
 else {

-    usage('one of -c, -s or -u must be specifcied');
+    usage('one of -c, -s or -u must be specified');

 }
 exit 0;
 
 }
 exit 0;
 


@@ -280,7 +288,7 @@ sub do_update {
        elsif (/^\s+(\d+): -(.*)/) {
            my $old;
            ($line, $old) = ($1,$2);
        elsif (/^\s+(\d+): -(.*)/) {
            my $old;
            ($line, $old) = ($1,$2);

-           die "$.: old line without preceeding filename\n"
+           die "$.: old line without preceding filename\n"

                            unless defined $file;
            die "Dup line number: $line\n" if exists $changes{$file}{$line};
            $changes{$file}{$line}[0] = $old;
                            unless defined $file;
            die "Dup line number: $line\n" if exists $changes{$file}{$line};
            $changes{$file}{$line}[0] = $old;