Skip to content

Commit be6a05d

Browse files
committed
drop the 5
This commit drop PERL_REVISION from $] and $^V. Since $^V expects 3 components, we add a .0 at the end.
1 parent 9e152df commit be6a05d

File tree

5 files changed

+14
-18
lines changed

5 files changed

+14
-18
lines changed

Configure

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7118,16 +7118,16 @@ $echo "(You have $package $version_patchlevel_string.)"
71187118
case "$osname" in
71197119
dos|vms)
71207120
: XXX Should be a Configure test for double-dots in filenames.
7121-
version=`echo $revision $patchlevel $subversion | \
7122-
$awk '{ printf "%d_%d_%d", $1, $2, $3 }'`
7123-
api_versionstring=`echo $api_revision $api_version $api_subversion | \
7124-
$awk '{ printf "%d_%d_%d", $1, $2, $3 }'`
7121+
version=`echo $patchlevel $subversion | \
7122+
$awk '{ printf "%d_%d", $1, $2 }'`
7123+
api_versionstring=`echo $api_version $api_subversion | \
7124+
$awk '{ printf "%d_%d", $1, $2 }'`
71257125
;;
71267126
*)
7127-
version=`echo $revision $patchlevel $subversion | \
7128-
$awk '{ printf "%d.%d.%d", $1, $2, $3 }'`
7127+
version=`echo $patchlevel $subversion | \
7128+
$awk '{ printf "%d.%d", $1, $2 }'`
71297129
api_versionstring=`echo $api_revision $api_version $api_subversion | \
7130-
$awk '{ printf "%d.%d.%d", $1, $2, $3 }'`
7130+
$awk '{ printf "%d.%d", $1, $2 }'`
71317131
;;
71327132
esac
71337133
: Special case the 5.005_xx maintenance series, which used 5.005

Porting/makerel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,10 @@ my @patchlevel_h = <PATCHLEVEL>;
6262
close PATCHLEVEL;
6363
my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h;
6464
print $patchlevel_h;
65-
my $revision = $1 if $patchlevel_h =~ /PERL_REVISION\s+(\d+)/;
6665
my $patchlevel = $1 if $patchlevel_h =~ /PERL_VERSION\s+(\d+)/;
6766
my $subversion = $1 if $patchlevel_h =~ /PERL_SUBVERSION\s+(\d+)/;
6867
die "Unable to parse patchlevel.h" unless $subversion >= 0;
69-
my $vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion);
68+
my $vers = sprintf("%d.%d", $patchlevel, $subversion);
7069

7170
# fetch list of local patches
7271
my (@local_patches, @lpatch_tags, $lpatch_tags);

myconfig.SH

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $startsh
2929
3030
# Note that the text lines /^Summary of/ .. /^\s*$/ are copied into Config.pm.
3131
cat <<'!NO!SUBS!'
32-
Summary of my $package (revision $revision $version_patchlevel_string) configuration:
32+
Summary of my $package ($version_patchlevel_string) configuration:
3333
$git_commit_id_title $git_commit_id$git_ancestor_line
3434
Platform:
3535
osname=$osname

perl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4011,9 +4011,8 @@ S_minus_v(pTHX)
40114011
#endif /* #ifdef PERL_PATCHNUM */
40124012
PIO_stdout = PerlIO_stdout();
40134013
PerlIO_printf(PIO_stdout,
4014-
"\nThis is perl " STRINGIFY(PERL_REVISION)
4015-
", version " STRINGIFY(PERL_VERSION)
4016-
", subversion " STRINGIFY(PERL_SUBVERSION)
4014+
"\nThis is perl, version " STRINGIFY(PERL_VERSION)
4015+
", subversion " STRINGIFY(PERL_SUBVERSION)
40174016
" (%" SVf ") built for " ARCHNAME, SVfARG(level)
40184017
);
40194018
SvREFCNT_dec_NN(level);

perl.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5351,12 +5351,10 @@ EXTERN_C char **environ; /* environment variables supplied via exec */
53515351
#include "patchlevel.h"
53525352
#undef PERL_PATCHLEVEL_H_IMPLICIT
53535353

5354-
#define PERL_VERSION_STRING STRINGIFY(PERL_REVISION) "." \
5355-
STRINGIFY(PERL_VERSION) "." \
5356-
STRINGIFY(PERL_SUBVERSION)
5354+
#define PERL_VERSION_STRING STRINGIFY(PERL_VERSION) "." \
5355+
STRINGIFY(PERL_SUBVERSION) ".0"
53575356

5358-
#define PERL_API_VERSION_STRING STRINGIFY(PERL_API_REVISION) "." \
5359-
STRINGIFY(PERL_API_VERSION) "." \
5357+
#define PERL_API_VERSION_STRING STRINGIFY(PERL_API_VERSION) "." \
53605358
STRINGIFY(PERL_API_SUBVERSION)
53615359

53625360
START_EXTERN_C

0 commit comments

Comments
 (0)