diff options
| author | David Golden <dagolden@cpan.org> | 2009-11-12 10:46:30 -0500 |
|---|---|---|
| committer | David Golden <dagolden@cpan.org> | 2009-11-14 23:09:27 -0500 |
| commit | ded326e4b6fad7e2479796691d0c27b89d2fe080 (patch) | |
| tree | 36c098634f3dbc2ccadd8848eda7081ceef32bd3 | |
| parent | d0f83c37b9d28134de63d7e3eb8427ccf56ca5ba (diff) | |
| download | perl-ded326e4b6fad7e2479796691d0c27b89d2fe080.tar.gz | |
Change perl -v version format
New format:
This is perl 5, version 11, subversion 1 (v5.11.1) ...
The rationale for this change is that the Perl 5 interpreter will never
increment PERL_REVISION from 5 to 6, so we want people to start focusing
on the PERL_VERSION number as most significant and PERL_SUBVERSION as
equivalent to a "release number". In other words, "perl 5" is a
language, this is the 11th version of it, and the second release of that
version (counting from zero). Among other things, this makes the
output of -v and -V more consistent.
The old v-string style is included for familiarity and usage in code.
For builds from git, it will include the same extended format as it
did before, e.g. "(v5.11.1-176-gaf24cc9*)"
| -rw-r--r-- | perl.c | 8 | ||||
| -rw-r--r-- | t/run/switches.t | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -3222,9 +3222,11 @@ Perl_moreswitches(pTHX_ const char *s) } #endif PerlIO_printf(PerlIO_stdout(), - "\nThis is perl, %"SVf - " built for " ARCHNAME, - level); + "\nThis is perl " STRINGIFY(PERL_REVISION) + ", version " STRINGIFY(PERL_VERSION) + ", subversion " STRINGIFY(PERL_SUBVERSION) + " (%"SVf") built for " ARCHNAME, level + ); SvREFCNT_dec(level); } #else /* DGUX */ diff --git a/t/run/switches.t b/t/run/switches.t index 8e076d4595..20cb77297a 100644 --- a/t/run/switches.t +++ b/t/run/switches.t @@ -267,8 +267,10 @@ SWTESTPM # there are definitely known build configs where this test will fail # DG/UX comes to mind. Maybe we should remove these special cases? my $v = sprintf "%vd", $^V; + my $ver = $Config{PERL_VERSION}; + my $rel = $Config{PERL_SUBVERSION}; like( runperl( switches => ['-v'] ), - qr/This is perl, v\Q$v\E(?:[-*\w]+| \([^)]+\))? built for \Q$Config{archname}\E.+Copyright.+Larry Wall.+Artistic License.+GNU General Public License/s, + qr/This is perl 5, version \Q$ver\E, subversion \Q$rel\E \(v\Q$v\E(?:[-*\w]+| \([^)]+\))?\) built for \Q$Config{archname}\E.+Copyright.+Larry Wall.+Artistic License.+GNU General Public License/s, '-v looks okay' ); } |