Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop the 5 (implement PPC0025) #22857

Draft
wants to merge 16 commits into
base: blead
Choose a base branch
from
Draft

Drop the 5 (implement PPC0025) #22857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
900d8a1
drop the 5
book Dec 9, 2024
6cffc27
create the :42 feature bundle
book Dec 11, 2024
a7f5931
fix the test for perl -v
book Dec 11, 2024
e52ef14
fix string comparisons with $] to use numeric comparison instead
book Dec 12, 2024
80ea3a5
fix perl5db.pl to import the correct feature bundle
book Dec 12, 2024
a7971fb
fix require tests: all versions up to 41.7 are valid
book Dec 12, 2024
174f3b0
fix use tests: all versions up to 41.7 are valid
book Dec 12, 2024
68ac4b4
fix $archname in ExtUtils::MakeMaker
book Dec 12, 2024
bb9ed60
fix skip for future Perl
book Dec 12, 2024
9c4ad7f
fix XS-APItest test about Perl API version
book Dec 12, 2024
bcfbac3
fix B::Deparse tests
book Dec 12, 2024
e37eb17
update fatal deprecation messages with the new version scheme
book Dec 12, 2024
0c0408c
fix perl_version in regen/regen_lib.pl
book Dec 19, 2024
42dd065
fix Module-CoreList to support versions larger than 5
book Dec 16, 2024
073dd2b
WIP - bump versions of modified files to please t/porting/cmp_version.t
book Dec 19, 2024
b104cb0
fix $Config{version}
book Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions Configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7118,16 +7118,16 @@ $echo "(You have $package $version_patchlevel_string.)"
case "$osname" in
dos|vms)
: XXX Should be a Configure test for double-dots in filenames.
version=`echo $revision $patchlevel $subversion | \
$awk '{ printf "%d_%d_%d", $1, $2, $3 }'`
api_versionstring=`echo $api_revision $api_version $api_subversion | \
$awk '{ printf "%d_%d_%d", $1, $2, $3 }'`
version=`echo $patchlevel $subversion | \
$awk '{ printf "%d_%03d", $1, $2 }'`
api_versionstring=`echo $api_version $api_subversion | \
$awk '{ printf "%d_%03d", $1, $2 }'`
;;
*)
version=`echo $revision $patchlevel $subversion | \
$awk '{ printf "%d.%d.%d", $1, $2, $3 }'`
version=`echo $patchlevel $subversion | \
$awk '{ printf "%d.%d", $1, $2 }'`
api_versionstring=`echo $api_revision $api_version $api_subversion | \
$awk '{ printf "%d.%d.%d", $1, $2, $3 }'`
$awk '{ printf "%d.%d", $1, $2 }'`
;;
esac
: Special case the 5.005_xx maintenance series, which used 5.005
Expand Down
2 changes: 1 addition & 1 deletion META.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"[email protected]"
],
"dynamic_config" : 1,
"generated_by" : "CPAN::Meta version 2.150010",
"generated_by" : "CPAN::Meta version 2.150011",
"license" : [
"perl_5"
],
Expand Down
2 changes: 1 addition & 1 deletion META.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author:
- [email protected]
build_requires: {}
dynamic_config: 1
generated_by: 'CPAN::Meta version 2.150010, CPAN::Meta::Converter version 2.150010'
generated_by: 'CPAN::Meta version 2.150011, CPAN::Meta::Converter version 2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
Expand Down
3 changes: 1 addition & 2 deletions Porting/makerel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ my @patchlevel_h = <PATCHLEVEL>;
close PATCHLEVEL;
my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h;
print $patchlevel_h;
my $revision = $1 if $patchlevel_h =~ /PERL_REVISION\s+(\d+)/;
my $patchlevel = $1 if $patchlevel_h =~ /PERL_VERSION\s+(\d+)/;
my $subversion = $1 if $patchlevel_h =~ /PERL_SUBVERSION\s+(\d+)/;
die "Unable to parse patchlevel.h" unless $subversion >= 0;
my $vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion);
my $vers = sprintf("%d.%d", $patchlevel, $subversion);

# fetch list of local patches
my (@local_patches, @lpatch_tags, $lpatch_tags);
Expand Down
4 changes: 2 additions & 2 deletions cpan/CPAN-Meta-Requirements/t/from-hash.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ for my $string (10, '>= 2, <= 9, != 7') {

SKIP: {
skip "Can't tell v-strings from strings until 5.8.1", 1
unless $] gt '5.008';
unless "$]" > 5.008;
my $string_hash = {
Left => 10,
Shared => '= 2',
Expand Down Expand Up @@ -87,7 +87,7 @@ SKIP: {

SKIP: {
skip "Can't tell v-strings from strings until 5.8.1", 2
unless $] gt '5.008';
unless "$]" > 5.008;
my $string_hash = {
Left => 10,
Shared => v50.44.60,
Expand Down
2 changes: 1 addition & 1 deletion cpan/CPAN-Meta-YAML/t/01_compile.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BEGIN {
use Test::More 0.88;

# Check their perl version
ok( $] ge '5.008001', "Your perl is new enough" );
ok( "$]" >= 5.008001, "Your perl is new enough" );

# Does the module load
require_ok( 'CPAN::Meta::YAML' );
Expand Down
4 changes: 2 additions & 2 deletions cpan/CPAN-Meta/lib/CPAN/Meta.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use strict;
use warnings;
package CPAN::Meta;

our $VERSION = '2.150010';
our $VERSION = '2.150011';

#pod =head1 SYNOPSIS
#pod
Expand Down Expand Up @@ -398,7 +398,7 @@ sub save {
my ($self, $file, $options) = @_;

my $version = $options->{version} || '2';
my $layer = $] ge '5.008001' ? ':utf8' : '';
my $layer = "$]" >= 5.008001 ? ':utf8' : '';

if ( $version ge '2' ) {
carp "'$file' should end in '.json'"
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
dos2unix);
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

my $Is_VMS = $^O eq 'VMS';
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ our @ISA = qw(Exporter);

our @EXPORT = qw(test_harness pod2man perllocal_install uninstall
warn_if_old_packlist test_s cp_nonempty);
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

my $Is_VMS = $^O eq 'VMS';
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::Liblist;
use strict;
use warnings;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

use File::Spec;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use 5.006;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

use ExtUtils::MakeMaker::Config;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use strict;
use warnings;
use ExtUtils::MakeMaker::Config;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::Liblist;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MM_AIX;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

use ExtUtils::MakeMaker::Config;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MM_Any;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

use Carp;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;

our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;


Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require ExtUtils::MM_Unix;
require ExtUtils::MM_Win32;
our @ISA = qw( ExtUtils::MM_Unix );

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;


Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::MM_DOS;
use strict;
use warnings;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Any;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BEGIN {
our @ISA = qw( ExtUtils::MM_Unix );
}

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;


Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::MM_MacOS;
use strict;
use warnings;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

sub new {
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use warnings;
use ExtUtils::MakeMaker::Config;
use File::Basename;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Win32;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use warnings;
use ExtUtils::MakeMaker qw(neatvalue);
use File::Spec;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Any;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS390.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MM_OS390;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

use ExtUtils::MakeMaker::Config;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MM_QNX;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Unix;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MM_UWIN;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Unix;
Expand Down
7 changes: 5 additions & 2 deletions cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue _sprintf562);

# If $VERSION is in scope, parse_version() breaks
{
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;
}

Expand Down Expand Up @@ -3255,7 +3255,10 @@ PPD_PERLVERS
# archname did not change from 5.6 to 5.8, but those versions may
# not be not binary compatible so now we append the part of the
# version that changes when binary compatibility may change
if ("$]" >= 5.008) {
if ("$]" >= 41) {
$archname .= "-$Config{api_version}";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to @haarg, this should be $Config{api_versionstring}.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And the test should be:

if ("$]" >= 5.041) {

}
elsif ("$]" >= 5.008) {
$archname .= "-$Config{api_revision}.$Config{api_version}";
}
push @ppd_chunks, sprintf <<'PPD_OUT', $archname;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ BEGIN {

use File::Basename;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Any;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MM_VOS;

use strict;
use warnings;
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Unix;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw(neatvalue _sprintf562);
require ExtUtils::MM_Any;
require ExtUtils::MM_Unix;
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

$ENV{EMXSHELL} = 'sh'; # to run `commands`
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::MM_Win95;
use strict;
use warnings;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require ExtUtils::MM_Win32;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::MY;
use strict;
require ExtUtils::MM;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;
our @ISA = qw(ExtUtils::MM);

Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ my %Recognized_Att_Keys;
our %macro_fsentity; # whether a macro is a filesystem name
our %macro_dep; # whether a macro is a dependency

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

# Emulate something resembling CVS $Revision$
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::MakeMaker::Config;
use strict;
use warnings;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

use Config ();
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::MakeMaker::FAQ;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

1;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Locale;

use strict;
use warnings;
our $VERSION = "7.70";
our $VERSION = "7.71";
$VERSION =~ tr/_//d;

use base 'Exporter';
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::MakeMaker::Tutorial;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;


Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use warnings;

use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);

$VERSION = '7.70';
$VERSION = '7.71';
$VERSION =~ tr/_//d;
$CLASS = 'version';

Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use warnings;

use vars qw($VERSION $CLASS $STRICT $LAX);

$VERSION = '7.70';
$VERSION = '7.71';
$VERSION =~ tr/_//d;

#--------------------------------------------------------------------------#
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap;
use strict;
use warnings;

our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

require Exporter;
Expand Down
2 changes: 1 addition & 1 deletion cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use Config;

our @ISA = qw(Exporter);
our @EXPORT = qw(&Mksymlists);
our $VERSION = '7.70';
our $VERSION = '7.71';
$VERSION =~ tr/_//d;

sub Mksymlists {
Expand Down
Loading
Loading