In perl.git, the branch maint-5.20 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8b9bf800bf7c4f5da7292562739ad73ff7a62d44?hp=5f9029e37e6b66028a4bf30bfb86c088151a9adf>
- Log ----------------------------------------------------------------- commit 8b9bf800bf7c4f5da7292562739ad73ff7a62d44 Author: Abigail <[email protected]> Date: Sun Jul 20 14:43:59 2014 +0200 Installing Inline no longer installs Inline::C. So, when testing cpan, install Inline::C. (cherry picked from commit 65651c629b65c84446f2ec14cb59134d6d1c743f) M Porting/release_managers_guide.pod commit 36837770ed1c3480e3c682eacbc3f06ff245999e Author: Steve Hay <[email protected]> Date: Thu Jan 29 14:23:37 2015 +0000 RMG - Note that Porting/cmVERSION.pl should be used to check more releases t/porting/cmp_version.t only runs Porting/cmVERSION.pl for the previous release of the current branch, but we need to check that our versions differ from modules in releases from other branches too. For example, when releasing 5.20.2 we need to check against 5.18.4 too. (cherry picked from commit a8ec9917c1913282d626f8c7467e40e55b7f5c97) M Porting/release_managers_guide.pod commit 79e4d7054794042f280f6acec6f3f71180d45b04 Author: Steve Hay <[email protected]> Date: Sat Jan 31 15:33:16 2015 +0000 RMG - Put all version-bump related information about INSTALL in one place Also correct the phrase referred to by the RMG to match what INSTALL actualy says, and change the wording of one section of INSTALL to match the other. (cherry picked from commit 2f05d2097c6cf5e9fa8a7473b06bc8c21aeb9044) M Porting/release_managers_guide.pod commit 66daea26d498bc70d7b10240d0704ad09344f712 Author: Steve Hay <[email protected]> Date: Sat Jan 31 13:48:10 2015 +0000 RMG - Module/CoreList.pod is no longer updated, since 64eeb2c06c (cherry picked from commit a4a5107a70398a345859cc5ea0ec382b6ecdc9f3) M Porting/release_managers_guide.pod commit 251333d959da64a3a8433b30403ef96096d6b115 Author: Steve Hay <[email protected]> Date: Sat Jan 31 13:43:32 2015 +0000 RMG - Show correct Porting/corelist-perldelta.pl command for MAINT releases (cherry picked from commit be2822b05a2917d75353f93b9331bb7bb06a63eb) M Porting/release_managers_guide.pod commit 98b14a12ba52956ce26bbf070c3ae3bad013d78e Author: Steve Hay <[email protected]> Date: Sat Jan 31 15:22:13 2015 +0000 INSTALL - Correct one more binary compatibility note Follow-up to 5f9029e37e. M INSTALL commit ed91e74c919d6b62fdc07f19217f01244cb1992c Author: Chris 'BinGOs' Williams <[email protected]> Date: Thu Oct 2 09:11:14 2014 +0100 There's no need to rewrite the Module-CoreList pod now (cherry picked from commit 64eeb2c06c6efea59d1f58d8acfb0d4d3a8328aa) (Required to allow Porting/corelist.pl to run correctly on maint-5.20 since 594a33171d is already in maint-5.20, having been cherry-picked by b0e66da001) M Porting/corelist.pl commit 5ffbc11ff17fa80e99e59cc55c2205a314e92978 Author: Steve Hay <[email protected]> Date: Wed Sep 17 08:24:56 2014 +0100 Teach Porting/cmpVERSION.pl about Scalar-List-Utils (broken by cb8c84586a) (cherry picked from commit 4421e1e92869cabe47c9e70078cf52e18079a7c7) (Required to allow Porting/cmpVERSION.pl to run on maint-5.20 since cb8c84586a is already in maint-5.20, having been committed during the 5.19 development track) M Porting/cmpVERSION.pl ----------------------------------------------------------------------- Summary of changes: INSTALL | 3 ++- Porting/cmpVERSION.pl | 1 + Porting/corelist.pl | 13 +----------- Porting/release_managers_guide.pod | 43 ++++++++++++++++++++++++-------------- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/INSTALL b/INSTALL index 9c90d50..bc2374a 100644 --- a/INSTALL +++ b/INSTALL @@ -89,7 +89,8 @@ potential incompatibilities introduced with this release. A few of the most important issues are listed below, but you should refer to pod/perldelta.pod for more detailed information. -B<WARNING:> This version is not binary compatible with prior releases of Perl. +B<WARNING:> This version is not binary compatible with versions of Perl +earlier than 5.20.0. If you have built extensions (i.e. modules that include C code) using an earlier version of Perl, you will need to rebuild and reinstall those extensions. diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl index c92fe78..0123f29 100755 --- a/Porting/cmpVERSION.pl +++ b/Porting/cmpVERSION.pl @@ -120,6 +120,7 @@ sub pm_file_from_xs { # look for a .pm in lib/ based on that: my ($path) = shift =~ m!^(.*)/!; my ($last) = $path =~ m!([^/]+)\z!; + $last = 'List-Util' if $last eq 'Scalar-List-Utils'; $last =~ tr !-!/!; return "$path/lib/$last"; }) { diff --git a/Porting/corelist.pl b/Porting/corelist.pl index ab35359..fcca6d4 100755 --- a/Porting/corelist.pl +++ b/Porting/corelist.pl @@ -24,7 +24,6 @@ use IO::Uncompress::Gunzip; my $corelist_file = 'dist/Module-CoreList/lib/Module/CoreList.pm'; my $utils_file = 'dist/Module-CoreList/lib/Module/CoreList/Utils.pm'; -my $pod_file = 'dist/Module-CoreList/lib/Module/CoreList.pod'; my %lines; my %module_to_file; @@ -302,16 +301,6 @@ $corelist =~ s/^%bug_tracker .*? ;/$tracker/eismx; write_corelist($corelist,$corelist_file); -open( my $pod_fh, '<', $pod_file ); -my $pod = join( '', <$pod_fh> ); - -unless ( $pod =~ /and $perl_vstring releases of perl/ ) { - warn "Adding $perl_vstring to the list of perl versions covered by Module::CoreList\n"; - $pod =~ s/(currently\s+covers\s+(?:.*?))\s*and\s+(.*?)\s+releases\s+of\s+perl/$1, $2 and $perl_vstring releases of perl/ism; -} - -write_corelist($pod,$pod_file); - open( my $utils_fh, '<', $utils_file ); my $utils = join( '', <$utils_fh> ); close $utils_fh; @@ -342,7 +331,7 @@ $utils =~ s/^(my %delta\s*=\s*.*?)(^\);)$/$1$utilities_in_release$2/ism; write_corelist($utils,$utils_file); warn "All done. Please check over the following files carefully before committing.\nThanks!\n"; -warn "$corelist_file\n$pod_file\n$utils_file\n"; +warn "$corelist_file\n$utils_file\n"; sub write_corelist { my $content = shift; diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod index db709fd..cb0c894 100644 --- a/Porting/release_managers_guide.pod +++ b/Porting/release_managers_guide.pod @@ -388,8 +388,7 @@ Use git status and git diff to select changes you want to keep. Be particularly careful with F<INSTALL>, which contains a mixture of C<5.10.0>-type strings, some of which need bumping on every release, and some of which need to be left unchanged. -The line in F<INSTALL> about "is binary incompatible with" requires a -correct choice of earlier version to declare incompatibility with. +See below in L<"update INSTALL"> for more details. When doing a BLEAD-POINT or BLEAD-FINAL release, also make sure the C<PERL_API_*> constants in F<patchlevel.h> are in sync with the version @@ -434,8 +433,11 @@ version number. =head3 update INSTALL -Review and update INSTALL to account for the change in version number; -in particular, the "Coexistence with earlier versions of perl 5" section. +Review and update INSTALL to account for the change in version number. +The lines in F<INSTALL> about "is not binary compatible with" may require a +correct choice of earlier version to declare incompatibility with. These are +in the "Changes and Incompatibilities" and "Coexistence with earlier versions +of perl 5" sections. Be particularly careful with the section "Upgrading from 5.X.Y or earlier". The "X.Y" needs to be changed to the most recent version that we are @@ -527,6 +529,20 @@ then configure and build perl so that you have a Makefile and porting tools: $ ./Configure -Dusedevel -des && make +=head3 Check module versions + +For each Perl release since the previous release of the current branch, check +for modules that have identical version numbers but different contents by +running: + + $ ./perl Porting/cmpVERSION.pl --tag=v5.X.YY + +(This is done automatically by F<t/porting/cmp_version.t> for the previous +release of the current branch, but not for any releases from other branches.) + +Any modules that fail will need a version bump, plus a nudge to the upstream +maintainer for 'cpan' upstream modules. + =head3 update Module::CoreList =head4 Bump Module::CoreList* $VERSIONs @@ -591,13 +607,11 @@ This will chug for a while, possibly reporting various warnings about badly-indexed CPAN modules unrelated to the modules actually in core. Assuming all goes well, it will update F<dist/Module-CoreList/lib/Module/CoreList.pm> and possibly -F<dist/Module-CoreList/lib/Module/CoreList.pod> and/or F<dist/Module-CoreList/lib/Module/CoreList/Utils.pm>. Check those files over carefully: $ git diff dist/Module-CoreList/lib/Module/CoreList.pm - $ git diff dist/Module-CoreList/lib/Module/CoreList.pod $ git diff dist/Module-CoreList/lib/Module/CoreList/Utils.pm =head4 Bump version in Module::CoreList F<Changes> @@ -620,12 +634,6 @@ In addition, if this is a final release (rather than a release candidate): Update this version's entry in the C<%released> hash with today's date. -=item * - -Make sure that the script has correctly updated the C<CAVEATS> section -(Note, the C<CAVEATS> section is in -F<dist/Module-CoreList/lib/Module/CoreList.pod>) - =back =head4 Commit Module::CoreList changes @@ -634,7 +642,7 @@ Finally, commit the new version of Module::CoreList: (unless this is for MAINT; in which case commit it to blead first, then cherry-pick it back). - $ git commit -m 'Update Module::CoreList for 5.x.y' dist/Module-CoreList/Changes dist/Module-CoreList/lib/Module/CoreList.pm dist/Module-CoreList/lib/Module/CoreList.pod dist/Module-CoreList/lib/ ... [24 chars truncated] + $ git commit -m 'Update Module::CoreList for 5.x.y' dist/Module-CoreList/Changes dist/Module-CoreList/lib/Module/CoreList.pm dist/Module-CoreList/lib/Module/CoreList/Utils.pm =head4 Rebuild and test @@ -652,6 +660,10 @@ Fill in the "New/Updated Modules" sections now that Module::CoreList is updated: $ ./perl -Ilib Porting/corelist-perldelta.pl --mode=update pod/perldelta.pod +For a MAINT release use something like this instead: + + $ ./perl -Ilib Porting/corelist-perldelta.pl 5.020001 5.020002 --mode=update pod/perldelta.pod + Ideally, also fill in a summary of the major changes to each module for which an entry has been added by F<corelist-perldelta.pl>. @@ -944,7 +956,7 @@ Bootstrap the CPAN client on the clean install: Try installing a popular CPAN module that's reasonably complex and that has dependencies; for example: - CPAN> install Inline + CPAN> install Inline::C CPAN> quit Check that your perl can run this: @@ -1353,8 +1365,7 @@ Otherwise, run: $ ./perl -Ilib Porting/corelist.pl cpan -This will update F<dist/Module-CoreList/lib/Module/CoreList.pm>, -F<dist/Module-CoreList/lib/Module/CoreList.pod> and +This will update F<dist/Module-CoreList/lib/Module/CoreList.pm> and F<dist/Module-CoreList/lib/Module/CoreList/Utils.pm> as it did before, but this time adding new sections for the next BLEAD-POINT release. -- Perl5 Master Repository
