Skip to content

Commit a056c9c

Browse files
authored
revert/upgrade/test_5.36.0_memory (#24)
* Revert "upgrade/test_5.36.0_memory (#23)" This reverts commit 796025a. * revert/upgrade/test_5.36.0_memory * trigger tests [ci] 2023-09-11 06:13:46 * trigger tests [ci] 2023-09-11 06:33:45 * trigger tests [ci] 2023-09-11 06:41:48
1 parent 796025a commit a056c9c

File tree

3,091 files changed

+1153115
-1035107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,091 files changed

+1153115
-1035107
lines changed

bin/c2ph

Lines changed: 1368 additions & 0 deletions
Large diffs are not rendered by default.

bin/corelist

Lines changed: 2 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44
#!/usr/bin/perl
55

66
=head1 NAME
@@ -17,8 +17,6 @@ See L<Module::CoreList> for one.
1717
corelist [-a|-d] <ModuleName> | /<ModuleRegex>/ [<ModuleVersion>] ...
1818
corelist [-v <PerlVersion>] [ <ModuleName> | /<ModuleRegex>/ ] ...
1919
corelist [-r <PerlVersion>] ...
20-
corelist --utils [-d] <UtilityName> [<UtilityName>] ...
21-
corelist --utils -v <PerlVersion>
2220
corelist --feature <FeatureName> [<FeatureName>] ...
2321
corelist --diff PerlVersion PerlVersion
2422
corelist --upstream <ModuleName>
@@ -118,15 +116,6 @@ lists all of the perl releases and when they were released
118116
119117
If you pass a perl version you get the release date for that version only.
120118
121-
=item --utils
122-
123-
lists the first version of perl each named utility program was released with
124-
125-
May be used with -d to modify the first release criteria.
126-
127-
If used with -v <version> then all utilities released with that version of perl
128-
are listed, and any utility programs named on the command line are ignored.
129-
130119
=item --feature, -f
131120
132121
lists the first version bundle of each named feature given
@@ -156,7 +145,7 @@ my %Opts;
156145

157146
GetOptions(
158147
\%Opts,
159-
qw[ help|?! man! r|release:s v|version:s a! d diff|D utils feature|f u|upstream ]
148+
qw[ help|?! man! r|release:s v|version:s a! d diff|D feature|f u|upstream ]
160149
);
161150

162151
pod2usage(1) if $Opts{help};
@@ -195,12 +184,6 @@ if(exists $Opts{v} ){
195184
}
196185

197186
my $num_v = numify_version( $Opts{v} );
198-
199-
if ($Opts{utils}) {
200-
utilities_in_version($num_v);
201-
exit 0;
202-
}
203-
204187
my $version_hash = Module::CoreList->find_version($num_v);
205188

206189
if( !$version_hash ) {
@@ -227,15 +210,7 @@ if ($Opts{diff}) {
227210
my ($old_ver, $new_ver) = @ARGV;
228211

229212
my $old = numify_version($old_ver);
230-
if ( !Module::CoreList->find_version($old) ) {
231-
print "\nModule::CoreList has no info on perl $old_ver\n\n";
232-
exit 1;
233-
}
234213
my $new = numify_version($new_ver);
235-
if ( !Module::CoreList->find_version($new) ) {
236-
print "\nModule::CoreList has no info on perl $new_ver\n\n";
237-
exit 1;
238-
}
239214

240215
my %diff = Module::CoreList::changes_between($old, $new);
241216

@@ -255,25 +230,6 @@ if ($Opts{diff}) {
255230
exit(0);
256231
}
257232

258-
if ($Opts{utils}) {
259-
die "\n--utils only available with perl v5.19.1 or greater\n"
260-
if $] < 5.019001;
261-
262-
die "\nprovide at least one utility name to --utils\n"
263-
unless @ARGV;
264-
265-
warn "\n-a has no effect when --utils is used\n" if $Opts{a};
266-
warn "\n--diff has no effect when --utils is used\n" if $Opts{diff};
267-
warn "\n--upstream, or -u, has no effect when --utils is used\n" if $Opts{u};
268-
269-
my $when = maxstr(values %Module::CoreList::released);
270-
print "\n","Data for $when\n";
271-
272-
utility_version($_) for @ARGV;
273-
274-
exit(0);
275-
}
276-
277233
if ($Opts{feature}) {
278234
die "\n--feature is only available with perl v5.16.0 or greater\n"
279235
if $] < 5.016;
@@ -411,47 +367,6 @@ sub module_version {
411367
}
412368
}
413369

414-
sub utility_version {
415-
my ($utility) = @_;
416-
417-
require Module::CoreList::Utils;
418-
419-
my $released = $Opts{d}
420-
? Module::CoreList::Utils->first_release_by_date($utility)
421-
: Module::CoreList::Utils->first_release($utility);
422-
423-
my $removed = $Opts{d}
424-
? Module::CoreList::Utils->removed_from_by_date($utility)
425-
: Module::CoreList::Utils->removed_from($utility);
426-
427-
if ($released) {
428-
print "$utility was first released with perl ", format_perl_version($released);
429-
print " and later removed in ", format_perl_version($removed)
430-
if $removed;
431-
print "\n";
432-
} else {
433-
print "$utility was not in CORE (or so I think)\n";
434-
}
435-
}
436-
437-
sub utilities_in_version {
438-
my ($version) = @_;
439-
440-
require Module::CoreList::Utils;
441-
442-
my @utilities = Module::CoreList::Utils->utilities($version);
443-
444-
if (not @utilities) {
445-
print "\nModule::CoreList::Utils has no info on perl $version\n\n";
446-
exit 1;
447-
}
448-
449-
print "\nThe following utilities were in perl ",
450-
format_perl_version($version), " CORE\n";
451-
print "$_\n" for sort { lc($a) cmp lc($b) } @utilities;
452-
print "\n";
453-
}
454-
455370

456371
sub max_mod_len {
457372
my $versions = shift;

bin/cpan

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44
#!/usr/local/bin/perl
55

66
BEGIN { pop @INC if $INC[-1] eq '.' }
77
use strict;
88
use vars qw($VERSION);
99

10-
use App::Cpan;
11-
use CPAN::Version;
12-
my $minver = '1.64';
13-
if ( CPAN::Version->vlt($App::Cpan::VERSION, $minver) ) {
14-
warn "WARNING: your version of App::Cpan is $App::Cpan::VERSION while we would expect at least $minver";
15-
}
10+
use App::Cpan '1.64';
1611
$VERSION = '1.64';
1712

1813
my $rc = App::Cpan->run( @ARGV );
@@ -254,9 +249,9 @@ The build tools, L<ExtUtils::MakeMaker> and L<Module::Build> use some,
254249
while others matter to the levels above them. Some of these are specified
255250
by the Perl Toolchain Gang:
256251

257-
Lancaster Consensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/lancaster-consensus.md>
252+
Lancaster Concensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/lancaster-consensus.md>
258253

259-
Oslo Consensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/oslo-consensus.md>
254+
Oslo Concensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/oslo-consensus.md>
260255

261256
=over 4
262257

@@ -273,7 +268,7 @@ to C<1> unless it already has a value (even if that value is false).
273268

274269
=item CPAN_OPTS
275270

276-
As with C<PERL5OPT>, a string of additional C<cpan(1)> options to
271+
As with C<PERL5OPTS>, a string of additional C<cpan(1)> options to
277272
add to those you specify on the command line.
278273

279274
=item CPANSCRIPT_LOGLEVEL

bin/cpanm

Lines changed: 6 additions & 9 deletions
Large diffs are not rendered by default.

bin/enc2xs

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44
#!./perl
55
BEGIN {
66
# @INC poking no longer needed w/ new MakeMaker and Makefile.PL's
@@ -14,7 +14,7 @@ use warnings;
1414
use Getopt::Std;
1515
use Config;
1616
my @orig_ARGV = @ARGV;
17-
our $VERSION = do { my @r = (q$Revision: 2.24 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
17+
our $VERSION = do { my @r = (q$Revision: 2.20 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
1818

1919
# These may get re-ordered.
2020
# RAW is a do_now as inserted by &enter
@@ -147,7 +147,6 @@ getopts('CM:SQqOo:f:n:v',\%opt);
147147
$opt{M} and make_makefile_pl($opt{M}, @ARGV);
148148
$opt{C} and make_configlocal_pm($opt{C}, @ARGV);
149149
$opt{v} ||= $ENV{ENC2XS_VERBOSE};
150-
$opt{q} ||= $ENV{ENC2XS_NO_COMMENTS};
151150

152151
sub verbose {
153152
print STDERR @_ if $opt{v};
@@ -252,12 +251,7 @@ if ($cname =~ /\.(c|xs)$/i) # VMS may have upcased filenames with DECC$ARGV_PARS
252251
END
253252
}
254253

255-
if ($cname =~ /\.c$/i && $Config{ccname} eq "gcc")
256-
{
257-
print C qq(#pragma GCC diagnostic ignored "-Wc++-compat"\n);
258-
}
259-
260-
if ($cname =~ /\.xs$/i)
254+
if ($cname =~ /(\w+)\.xs$/)
261255
{
262256
print C "#define PERL_NO_GET_CONTEXT\n";
263257
print C "#include <EXTERN.h>\n";
@@ -267,15 +261,15 @@ END
267261
print C "#include \"encode.h\"\n\n";
268262

269263
}
270-
elsif ($cname =~ /\.enc$/i)
264+
elsif ($cname =~ /\.enc$/)
271265
{
272266
$doEnc = 1;
273267
}
274-
elsif ($cname =~ /\.ucm$/i)
268+
elsif ($cname =~ /\.ucm$/)
275269
{
276270
$doUcm = 1;
277271
}
278-
elsif ($cname =~ /\.pet$/i)
272+
elsif ($cname =~ /\.pet$/)
279273
{
280274
$doPet = 1;
281275
}
@@ -923,7 +917,24 @@ sub decode_U
923917
}
924918

925919
my @uname;
926-
sub char_names{} # cf. https://rt.cpan.org/Ticket/Display.html?id=132471
920+
sub char_names
921+
{
922+
my $s = do "unicore/Name.pl";
923+
die "char_names: unicore/Name.pl: $!\n" unless defined $s;
924+
pos($s) = 0;
925+
while ($s =~ /\G([0-9a-f]+)\t([0-9a-f]*)\t(.*?)\s*\n/igc)
926+
{
927+
my $name = $3;
928+
my $s = hex($1);
929+
last if $s >= 0x10000;
930+
my $e = length($2) ? hex($2) : $s;
931+
for (my $i = $s; $i <= $e; $i++)
932+
{
933+
$uname[$i] = $name;
934+
# print sprintf("U%04X $name\n",$i);
935+
}
936+
}
937+
}
927938

928939
sub output_ucm_page
929940
{
@@ -1030,7 +1041,8 @@ sub find_e2x{
10301041

10311042
sub make_makefile_pl
10321043
{
1033-
eval { require Encode } or die "You need to install Encode to use enc2xs -M\nerror: $@\n";
1044+
eval { require Encode; };
1045+
$@ and die "You need to install Encode to use enc2xs -M\nerror: $@\n";
10341046
# our used for variable expansion
10351047
$_Enc2xs = $0;
10361048
$_Version = $VERSION;
@@ -1054,7 +1066,8 @@ use vars qw(
10541066
);
10551067

10561068
sub make_configlocal_pm {
1057-
eval { require Encode } or die "Unable to require Encode: $@\n";
1069+
eval { require Encode; };
1070+
$@ and die "Unable to require Encode: $@\n";
10581071
eval { require File::Spec; };
10591072

10601073
# our used for variable expantion
@@ -1074,7 +1087,8 @@ sub make_configlocal_pm {
10741087
$mod =~ s/.*\bEncode\b/Encode/o;
10751088
$mod =~ s/\.pm\z//o;
10761089
$mod =~ s,/,::,og;
1077-
eval qq{ require $mod; } or return;
1090+
eval qq{ require $mod; };
1091+
return if $@;
10781092
warn qq{ require $mod;\n};
10791093
for my $enc ( Encode->encodings() ) {
10801094
no warnings;
@@ -1108,7 +1122,8 @@ sub _mkversion{
11081122
}
11091123

11101124
sub _print_expand{
1111-
eval { require File::Basename } or die "File::Basename needed. Are you on miniperl?;\nerror: $@\n";
1125+
eval { require File::Basename; };
1126+
$@ and die "File::Basename needed. Are you on miniperl?;\nerror: $@\n";
11121127
File::Basename->import();
11131128
my ($src, $dst, $clobber) = @_;
11141129
if (!$clobber and -e $dst){

bin/encguess

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44
#!./perl
55
use 5.008001;
66
BEGIN { pop @INC if $INC[-1] eq '.' }
@@ -64,7 +64,7 @@ encguess - guess character encodings of files
6464
6565
=head1 VERSION
6666
67-
$Id: encguess,v 0.3 2020/12/02 01:28:17 dankogai Exp $
67+
$Id: encguess,v 0.2 2016/08/04 03:15:58 dankogai Exp $
6868
6969
=head1 SYNOPSIS
7070
@@ -81,7 +81,7 @@ show this message and exit.
8181
=item -s
8282
8383
specify a list of "suspect encoding types" to test,
84-
separated by either C<:> or C<,>
84+
seperated by either C<:> or C<,>
8585
8686
=item -S
8787

bin/h2ph

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44

55
BEGIN { pop @INC if $INC[-1] eq '.' }
66

bin/h2xs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44

55
BEGIN { pop @INC if $INC[-1] eq '.' }
66

@@ -250,7 +250,7 @@ Note that some types of arguments/return-values for functions may
250250
result in XSUB-declarations/typemap-entries which need
251251
hand-editing. Such may be objects which cannot be converted from/to a
252252
pointer (like C<long long>), pointers to functions, or arrays. See
253-
also the section on L</LIMITATIONS of B<-x>>.
253+
also the section on L<LIMITATIONS of B<-x>>.
254254
255255
=back
256256
@@ -1904,7 +1904,7 @@ WriteMakefile(
19041904
AUTHOR => '$author <$email>',
19051905
#LICENSE => 'perl',
19061906
#Value must be from legacy list of licenses here
1907-
#https://metacpan.org/pod/Module::Build::API
1907+
#http://search.cpan.org/perldoc?Module%3A%3ABuild%3A%3AAPI
19081908
END
19091909
if (!$opt_X) { # print C stuff, unless XS is disabled
19101910
$opt_F = '' unless defined $opt_F;
@@ -1966,7 +1966,7 @@ $generate_code
19661966
__END__
19671967
gave unexpected error $@
19681968
Please report the circumstances of this bug in h2xs version $H2XS_VERSION
1969-
using the issue tracker at https://github.com/Perl/perl5/issues.
1969+
using the perlbug script.
19701970
EOM
19711971
} else {
19721972
my $fail;
@@ -1987,7 +1987,7 @@ the files $ext$modpname/$constscfname and $ext$modpname/$constsxsfname
19871987
correctly.
19881988
19891989
Please report the circumstances of this bug in h2xs version $H2XS_VERSION
1990-
using the issue tracker at https://github.com/Perl/perl5/issues.
1990+
using the perlbug script.
19911991
EOM
19921992
} else {
19931993
unlink $constscfname, $constsxsfname;

bin/instmodsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/home/git/binary-com/perl/bin/perl
22
eval 'exec /home/git/binary-com/perl/bin/perl -S $0 ${1+"$@"}'
3-
if 0; # ^ Run only under a shell
3+
if $running_under_some_shell;
44
#!/usr/bin/perl -w
55

66
BEGIN { pop @INC if $INC[-1] eq '.' }

0 commit comments

Comments
 (0)