Skip to content

Commit 6b3eaab

Browse files
author
H.Merijn Brand
committed
Sync Config::Perl::V with release 0.26
1 parent 55701e3 commit 6b3eaab

18 files changed

+266
-16
lines changed

‎MANIFEST

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ cpan/Config-Perl-V/t/27_plv5200.t Config::Perl::V
236236
cpan/Config-Perl-V/t/27_plv5202.t Config::Perl::V
237237
cpan/Config-Perl-V/t/28_plv52201w.t Config::Perl::V
238238
cpan/Config-Perl-V/t/28_plv5220.t Config::Perl::V
239+
cpan/Config-Perl-V/t/29_plv5235w.t Config::Perl::V
240+
cpan/Config-Perl-V/t/30_plv5240.t Config::Perl::V
239241
cpan/Config-Perl-V/V.pm Config::Perl::V
240242
cpan/CPAN/lib/App/Cpan.pm helper package for CPAN.pm
241243
cpan/CPAN/lib/CPAN/API/HOWTO.pod recipe book for programming with CPAN.pm

‎Porting/Maintainers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ package Maintainers;
227227
},
228228

229229
'Config::Perl::V' => {
230-
'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.25.tgz',
230+
'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.26.tgz',
231231
'FILES' => q[cpan/Config-Perl-V],
232232
'EXCLUDED' => [qw(
233233
examples/show-v.pl

‎cpan/Config-Perl-V/V.pm

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use warnings;
88
use Config;
99
use Exporter;
1010
use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
11-
$VERSION = "0.25";
11+
$VERSION = "0.26";
1212
@ISA = ("Exporter");
1313
@EXPORT_OK = qw( plv2hash summary myconfig signature );
1414
%EXPORT_TAGS = (
@@ -61,6 +61,7 @@ my %BTD = map { $_ => 0 } qw(
6161
PERL_RELOCATABLE_INCPUSH
6262
PERL_USE_DEVEL
6363
PERL_USE_SAFE_PUTENV
64+
SILENT_NO_TAINT_SUPPORT
6465
UNLINK_ALL_VERSIONS
6566
USE_ATTRIBUTES_FOR_PERLIO
6667
USE_FAST_STDIO
@@ -253,6 +254,15 @@ sub plv2hash
253254
$config{git_commit_id} = $2;
254255
}
255256

257+
# these are always last on line and can have multiple quotation styles
258+
for my $k (qw( ccflags ldflags lddlflags )) {
259+
$pv =~ s{, \s* $k \s*=\s* (.*) \s*$}{}mx or next;
260+
my $v = $1;
261+
$v =~ s/\s*,\s*$//;
262+
$v =~ s/^(['"])(.*)\1$/$2/;
263+
$config{$k} = $v;
264+
}
265+
256266
if (my %kv = ($pv =~ m{\b
257267
(\w+) # key
258268
\s*= # assign
@@ -537,7 +547,7 @@ H.Merijn Brand <[email protected]>
537547
538548
=head1 COPYRIGHT AND LICENSE
539549
540-
Copyright (C) 2009-2015 H.Merijn Brand
550+
Copyright (C) 2009-2016 H.Merijn Brand
541551
542552
This library is free software; you can redistribute it and/or modify
543553
it under the same terms as Perl itself.

‎cpan/Config-Perl-V/t/20_plv56.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 95;
8+
my $tests = 96;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/21_plv58.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 95;
8+
my $tests = 96;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/22_plv510.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 94;
8+
my $tests = 95;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/23_plv512.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 96;
8+
my $tests = 97;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/24_plv514.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 96;
8+
my $tests = 97;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/25_plv516.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 95;
8+
my $tests = 96;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/25_plv5162.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 153;
8+
my $tests = 154;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/26_plv518.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 114;
8+
my $tests = 115;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/26_plv5182.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 114;
8+
my $tests = 115;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/27_plv5200.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 114;
8+
my $tests = 115;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/27_plv5202.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 115;
8+
my $tests = 116;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/28_plv5220.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 115;
8+
my $tests = 116;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/28_plv52201w.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use warnings;
55

66
BEGIN {
77
use Test::More;
8-
my $tests = 115;
8+
my $tests = 116;
99
unless ($ENV{PERL_CORE}) {
1010
require Test::NoWarnings;
1111
Test::NoWarnings->import ();

‎cpan/Config-Perl-V/t/29_plv5235w.t

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
#!/pro/bin/perl
2+
3+
use strict;
4+
use warnings;
5+
6+
BEGIN {
7+
use Test::More;
8+
my $tests = 116;
9+
unless ($ENV{PERL_CORE}) {
10+
require Test::NoWarnings;
11+
Test::NoWarnings->import ();
12+
$tests++;
13+
}
14+
15+
plan tests => $tests;
16+
}
17+
18+
use Config::Perl::V;
19+
20+
ok (my $conf = Config::Perl::V::plv2hash (<DATA>), "Read perl -v block");
21+
ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc );
22+
23+
is ($conf->{build}{osname}, $conf->{config}{osname}, "osname");
24+
is ($conf->{build}{stamp}, "Nov 19 2015 00:18:50", "Build time");
25+
is ($conf->{config}{version}, "5.23.5", "reconstructed \$Config{version}");
26+
27+
my $opt = Config::Perl::V::plv2hash ("")->{build}{options};
28+
foreach my $o (sort qw(
29+
HAS_TIMES HAVE_INTERP_INTERN MULTIPLICITY PERLIO_LAYERS
30+
PERL_COPY_ON_WRITE PERL_DONT_CREATE_GVSV
31+
PERL_HASH_FUNC_ONE_AT_A_TIME_HARD
32+
PERL_IMPLICIT_CONTEXT PERL_IMPLICIT_SYS PERL_MALLOC_WRAP
33+
PERL_PRESERVE_IVUV
34+
USE_ITHREADS
35+
USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE
36+
USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME
37+
USE_PERLIO USE_PERL_ATOF
38+
)) {
39+
is ($conf->{build}{options}{$o}, 1, "Runtime option $o set");
40+
delete $opt->{$o};
41+
}
42+
foreach my $o (sort keys %$opt) {
43+
is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset");
44+
}
45+
46+
is_deeply ($conf->{build}{patches}, [], "No local patches");
47+
48+
my %check = (
49+
alignbytes => 8,
50+
api_version => 23,
51+
bincompat5005 => "undef",
52+
byteorder => 1234,
53+
cc => "cl",
54+
cccdlflags => "",
55+
ccdlflags => "",
56+
config_args => "undef",
57+
gccversion => "",
58+
gnulibc_version => "",
59+
ivsize => 4,
60+
ivtype => "long",
61+
ld => "link",
62+
lddlflags => q{-dll -nologo -nodefaultlib -debug -opt:ref,icf -ltcg -libpath:"c:\perl\lib\CORE" -machine:x86 "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" -subsystem:console,"5.01"},
63+
ldflags => q{-nologo -nodefaultlib -debug -opt:ref,icf -ltcg -libpath:"c:\perl\lib\CORE" -machine:x86 "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" -subsystem:console,"5.01"},
64+
libc => "msvcrt.lib",
65+
lseektype => "__int64",
66+
osvers => "6.1",
67+
use64bitall => "undef",
68+
use64bitint => "undef",
69+
);
70+
is ($conf->{config}{$_}, $check{$_}, "reconstructed \$Config{$_}") for sort keys %check;
71+
72+
__END__
73+
Summary of my perl5 (revision 5 version 23 subversion 5) configuration:
74+
75+
Platform:
76+
osname=MSWin32, osvers=6.1, archname=MSWin32-x86-multi-thread
77+
uname=''
78+
config_args='undef'
79+
hint=recommended, useposix=true, d_sigaction=undef
80+
useithreads=define, usemultiplicity=define
81+
use64bitint=undef, use64bitall=undef, uselongdouble=undef
82+
usemymalloc=n, bincompat5005=undef
83+
Compiler:
84+
cc='cl', ccflags ='-nologo -GF -W3 -O1 -MD -Zi -DNDEBUG -GL -DWIN32 -D_CONSOLE -DNO_STRICT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS',
85+
optimize='-O1 -MD -Zi -DNDEBUG -GL',
86+
cppflags='-DWIN32'
87+
ccversion='18.00.31101', gccversion='', gccosandvers=''
88+
intsize=4, longsize=4, ptrsize=4, doublesize=8, byteorder=1234, doublekind=3
89+
d_longlong=undef, longlongsize=8, d_longdbl=define, longdblsize=8, longdblkind=0
90+
ivtype='long', ivsize=4, nvtype='double', nvsize=8, Off_t='__int64', lseeksize=8
91+
alignbytes=8, prototype=define
92+
Linker and Libraries:
93+
ld='link', ldflags ='-nologo -nodefaultlib -debug -opt:ref,icf -ltcg -libpath:"c:\perl\lib\CORE" -machine:x86 "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" -subsystem:console,"5.01"'
94+
libpth=\lib
95+
libs=oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib version.lib odbc32.lib odbccp32.lib comctl32.lib msvcrt.lib
96+
perllibs=oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib version.lib odbc32.lib odbccp32.lib comctl32.lib msvcrt.lib
97+
libc=msvcrt.lib, so=dll, useshrplib=true, libperl=perl523.lib
98+
gnulibc_version=''
99+
Dynamic Linking:
100+
dlsrc=dl_win32.xs, dlext=dll, d_dlsymun=undef, ccdlflags=' '
101+
cccdlflags=' ', lddlflags='-dll -nologo -nodefaultlib -debug -opt:ref,icf -ltcg -libpath:"c:\perl\lib\CORE" -machine:x86 "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" -subsystem:console,"5.01"'
102+
103+
104+
Characteristics of this binary (from libperl):
105+
Compile-time options: HAS_TIMES HAVE_INTERP_INTERN MULTIPLICITY
106+
PERLIO_LAYERS PERL_COPY_ON_WRITE
107+
PERL_DONT_CREATE_GVSV
108+
PERL_HASH_FUNC_ONE_AT_A_TIME_HARD
109+
PERL_IMPLICIT_CONTEXT PERL_IMPLICIT_SYS
110+
PERL_MALLOC_WRAP PERL_PRESERVE_IVUV USE_ITHREADS
111+
USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE
112+
USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME
113+
USE_PERLIO USE_PERL_ATOF
114+
Built under MSWin32
115+
Compiled at Nov 19 2015 00:18:50
116+
@INC:
117+
C:/p523/src/lib
118+
.

0 commit comments

Comments
 (0)