In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2ea2ea91f2d94c3505995e927e5f085a085cf215?hp=6a3d1e7ec946e95930f5572e38977ee1c2e589a0>
- Log ----------------------------------------------------------------- commit 2ea2ea91f2d94c3505995e927e5f085a085cf215 Author: Florian Ragwitz <[email protected]> Date: Thu Jul 22 17:37:21 2010 +0200 Bump API subversion M Cross/config.sh-arm-linux M Cross/config.sh-arm-linux-n770 M Porting/config.sh M epoc/config.sh M patchlevel.h M plan9/config_sh.sample commit 544af516d72dfd84bc12bd04e76b84740ab3f78c Author: Florian Ragwitz <[email protected]> Date: Thu Jul 22 17:37:20 2010 +0200 For blead, bump-perl-version should consider SUBVERSION as API_SUBVERSION This makes the API version of a blead release equivalent to its full version number. For example, for 5.13.3, the API version was 5.13.0 before, and is 5.13.0 now. This does not change anything for stable releases. The API version of 5.14.1 will still be 5.14.0. Blead releases don't guarantee API stability. While they don't introduce API breakage on every release, they do so often enough to want to err on the safe side instead of making false claims in PERL_API_*. M Porting/bump-perl-version ----------------------------------------------------------------------- Summary of changes: Cross/config.sh-arm-linux | 6 +++--- Cross/config.sh-arm-linux-n770 | 6 +++--- Porting/bump-perl-version | 14 +++++++------- Porting/config.sh | 6 +++--- epoc/config.sh | 4 ++-- patchlevel.h | 2 +- plan9/config_sh.sample | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 06af520..4fd3498 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -32,9 +32,9 @@ alignbytes='4' ansi2knr='' aphostname='/bin/hostname' api_revision='5' -api_subversion='0' +api_subversion='3' api_version='13' -api_versionstring='5.13.0' +api_versionstring='5.13.3' ar='ar' archlib='/usr/lib/perl5/5.13.3/armv4l-linux' archlibexp='/usr/lib/perl5/5.13.3/armv4l-linux' @@ -1085,6 +1085,6 @@ PERL_VERSION=13 PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=13 -PERL_API_SUBVERSION=0 +PERL_API_SUBVERSION=3 PERL_PATCHLEVEL= PERL_CONFIG_SH=true diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 index c7cf3d0..378a28d 100644 --- a/Cross/config.sh-arm-linux-n770 +++ b/Cross/config.sh-arm-linux-n770 @@ -32,9 +32,9 @@ alignbytes='4' ansi2knr='' aphostname='/bin/hostname' api_revision='5' -api_subversion='0' +api_subversion='3' api_version='13' -api_versionstring='5.13.0' +api_versionstring='5.13.3' ar='ar' archlib='/usr/lib/perl5/5.13.3/armv4l-linux' archlibexp='/usr/lib/perl5/5.13.3/armv4l-linux' @@ -1059,6 +1059,6 @@ PERL_VERSION=13 PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=13 -PERL_API_SUBVERSION=0 +PERL_API_SUBVERSION=3 PERL_PATCHLEVEL= PERL_CONFIG_SH=true diff --git a/Porting/bump-perl-version b/Porting/bump-perl-version index 04999e7..d7aabba 100755 --- a/Porting/bump-perl-version +++ b/Porting/bump-perl-version @@ -118,14 +118,14 @@ my @maps = ( ], [ qr{^(api_subversion(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, - sub { $2, "${1}0$3" }, - 0, + sub { $2, ($newy % 2) ? "$1$newz$3" : "${1}0$3" }, + ($oldy % 2) ? $oldz : 0, qr/config/, ], [ qr{^(api_versionstring(?:=|\s+)'?) ([\d\.]+) ('?) (?!\.)}x, - sub { $2, "$1$newx.$newy.0$3" }, - "$oldx.$oldy.0", + sub { $2, ($newy % 2) ? "$1$newx.$newy.$newz$3": "$1$newx.$newy.0$3" }, + ($oldy % 2) ? "$oldx.$oldy.$oldz" : "$oldx.$oldy.0", qr/config/, ], [ @@ -142,12 +142,12 @@ my @maps = ( [ qr{\b (PERL_SUBVERSION(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, sub { $2, "$1$newz$3"}, - $oldz, + ($oldy % 2) ? $oldz : 0, ], [ qr{\b (PERL_API_SUBVERSION(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, - sub { $2, "${1}0$3"}, - 0, + sub { $2, ($newy % 2) ? "$1$newz$3" : "${1}0$3" }, + $oldz, ], # these two formats are in README.vms [ diff --git a/Porting/config.sh b/Porting/config.sh index 346c092..71c4965 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -45,9 +45,9 @@ alignbytes='4' ansi2knr='' aphostname='' api_revision='5' -api_subversion='0' +api_subversion='3' api_version='13' -api_versionstring='5.13.0' +api_versionstring='5.13.3' ar='ar' archlib='/opt/perl/lib/5.13.3/i686-linux-64int' archlibexp='/opt/perl/lib/5.13.3/i686-linux-64int' @@ -1114,7 +1114,7 @@ PERL_VERSION=13 PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=13 -PERL_API_SUBVERSION=0 +PERL_API_SUBVERSION=3 PERL_PATCHLEVEL=34948 PERL_CONFIG_SH=true : Variables propagated from previous config.sh file. diff --git a/epoc/config.sh b/epoc/config.sh index 1d32e6f..17df287 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -939,7 +939,7 @@ PERL_VERSION=13 PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=13 -PERL_API_SUBVERSION=0 +PERL_API_SUBVERSION=3 PERL_CONFIG_SH=true # Variables propagated from previous config.sh file. pp_sys_cflags='' @@ -1071,7 +1071,7 @@ PERL_VERSION=13 PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=13 -PERL_API_SUBVERSION=0 +PERL_API_SUBVERSION=3 CONFIGDOTSH=true # Variables propagated from previous config.sh file. pp_sys_cflags='' diff --git a/patchlevel.h b/patchlevel.h index 5c7b274..cc36735 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -32,7 +32,7 @@ */ #define PERL_API_REVISION 5 /* Adjust manually as needed. */ #define PERL_API_VERSION 13 /* Adjust manually as needed. */ -#define PERL_API_SUBVERSION 0 /* Adjust manually as needed. */ +#define PERL_API_SUBVERSION 3 /* Adjust manually as needed. */ /* XXX Note: The selection of non-default Configure options, such as -Duselonglong may invalidate these settings. Currently, Configure diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index 63080f1..16affb8 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -32,9 +32,9 @@ alignbytes='4' ansi2knr='' aphostname='/bin/uname -n' api_revision='5' -api_subversion='0' +api_subversion='3' api_version='13' -api_versionstring='5.13.0' +api_versionstring='5.13.3' ar='ar' archlib='/sys/lib/perl5/5.13.3/386' archlibexp='/sys/lib/perl5/5.13.3/386' @@ -1046,6 +1046,6 @@ PERL_VERSION=13 PERL_SUBVERSION=3 PERL_API_REVISION=5 PERL_API_VERSION=13 -PERL_API_SUBVERSION=0 +PERL_API_SUBVERSION=3 PERL_PATCHLEVEL= PERL_CONFIG_SH=true -- Perl5 Master Repository
