In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/ce9a710cf3fef4991e1de00d7de8623bbab120c8?hp=6c13a57c5f6ea13b95dccb8f70eab139cff818f3>
- Log ----------------------------------------------------------------- commit ce9a710cf3fef4991e1de00d7de8623bbab120c8 Author: David Mitchell <[email protected]> Date: Sat Jun 13 14:28:13 2009 +0100 minor updates to Maintainers.pl (cherry picked from commit 8861d6254fe66ac0cd3818811c381ab5d3d94c25) M Porting/Maintainers.pl commit fd9e77d3ab4c425b5c6ff1dbec81eff8d547f569 Author: Nicholas Clark <[email protected]> Date: Sat Jun 13 14:05:26 2009 +0100 Remove autodoc.pl from regen.pl and the lists of regenerated files in Makefiles. Should really have been done as part of 344af494c35a9f0f50dab51474b2e7cd806f1b08 (cherry picked from commit 22b7b87b206c3e0cdcc9f4c2f5fba2da95e75c95) M Cross/Makefile-cross-SH M Makefile.SH M regen.pl commit deebf8210e635ad113742c28b7b1ad2e6f7d9261 Author: Nicholas Clark <[email protected]> Date: Sat Jun 13 13:53:04 2009 +0100 Eliminate the regen_pods target from pod/Makefile, and references to it. (cherry picked from commit 1e2f36ef3d3f4de76635fcfba782b45ccf3fc578) M Cross/Makefile-cross-SH M Makefile.SH M Porting/pumpkin.pod M pod/Makefile.SH ----------------------------------------------------------------------- Summary of changes: Cross/Makefile-cross-SH | 9 ++------- Makefile.SH | 9 ++------- Porting/Maintainers.pl | 8 ++++---- Porting/pumpkin.pod | 7 ++----- pod/Makefile.SH | 8 -------- regen.pl | 6 +----- 6 files changed, 11 insertions(+), 36 deletions(-) diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index 70181b1..56b0a2f 100755 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -888,7 +888,6 @@ SYMH = perlvars.h intrpvar.h CHMOD_W = chmod +w # The following files are generated automatically -# autodoc.pl: pod/perlapi.pod pod/perlintern.pod # embed.pl: proto.h embed.h embedvar.h global.sym # perlapi.h perlapi.c # [* embed.pl needs pp.sym generated by opcode.pl! *] @@ -905,19 +904,15 @@ CHMOD_W = chmod +w AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \ embed.h embedvar.h global.sym \ - pod/perlintern.pod pod/perlapi.pod \ perlapi.h perlapi.c regnodes.h \ warnings.h lib/warnings.pm -.PHONY: regen_headers regen_pods regen_all +.PHONY: regen_headers regen_all regen regen_headers: FORCE -perl regen.pl -regen_pods: FORCE - -cd pod; $(LDLIBPTH) $(MAKE) regen_pods - -regen_all: regen regen_pods +regen_all: regen .PHONY: manisort manicheck diff --git a/Makefile.SH b/Makefile.SH index 11fbbb6..be12524 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1128,7 +1128,6 @@ SYMH = perlvars.h intrpvar.h CHMOD_W = chmod +w # The following files are generated automatically -# autodoc.pl: pod/perlapi.pod pod/perlintern.pod # embed.pl: proto.h embed.h embedvar.h global.sym # perlapi.h perlapi.c # [* embed.pl needs pp.sym generated by opcode.pl! *] @@ -1145,11 +1144,10 @@ CHMOD_W = chmod +w AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \ embed.h embedvar.h global.sym \ - pod/perlintern.pod pod/perlapi.pod \ perlapi.h perlapi.c regnodes.h \ warnings.h lib/warnings.pm -.PHONY: regen_headers regen_pods regen_all +.PHONY: regen_headers regen_all regen: FORCE -perl regen.pl @@ -1157,10 +1155,7 @@ regen: FORCE regen_headers: FORCE -perl regen.pl -v -regen_pods: FORCE - -cd pod; $(LDLIBPTH) $(MAKE) regen_pods - -regen_all: regen regen_pods +regen_all: regen .PHONY: manisort manicheck diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 58ab665..26ff823 100644 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -39,7 +39,7 @@ package Maintainers; 'jesse' => 'Jesse Vincent <[email protected]>', 'jhi' => 'Jarkko Hietaniemi <[email protected]>', 'jjore' => 'Joshua ben Jore <[email protected]>', - 'jpeacock' => 'John Peacock <[email protected]>', + 'jpeacock' => 'John Peacock <[email protected]>', 'jstowe' => 'Jonathan Stowe <[email protected]>', 'jv' => 'Johan Vromans <[email protected]>', 'kane' => 'Jos Boumans <[email protected]>', @@ -478,7 +478,7 @@ package Maintainers; 'Digest' => { 'MAINTAINER' => 'gaas', - 'DISTRIBUTION' => 'GAAS/Digest-1.15.tar.gz', + 'DISTRIBUTION' => 'GAAS/Digest-1.16.tar.gz', 'FILES' => q[lib/Digest.pm lib/Digest], 'EXCLUDED' => [ qw{digest-bench} ], 'MAP' => { 'Digest/' => 'lib/Digest/', @@ -492,7 +492,7 @@ package Maintainers; 'Digest::MD5' => { 'MAINTAINER' => 'gaas', - 'DISTRIBUTION' => 'GAAS/Digest-MD5-2.38.tar.gz', + 'DISTRIBUTION' => 'GAAS/Digest-MD5-2.39.tar.gz', 'FILES' => q[ext/Digest-MD5], 'EXCLUDED' => [ qw{rfc1321.txt} ], 'CPAN' => 1, @@ -1112,7 +1112,7 @@ package Maintainers; 'MIME::Base64' => { 'MAINTAINER' => 'gaas', - 'DISTRIBUTION' => 'GAAS/MIME-Base64-3.07.tar.gz', + 'DISTRIBUTION' => 'GAAS/MIME-Base64-3.08.tar.gz', 'FILES' => q[ext/MIME-Base64], 'EXCLUDED' => [ qw{ t/bad-sv.t }, ], 'CPAN' => 1, diff --git a/Porting/pumpkin.pod b/Porting/pumpkin.pod index 4dbbaa1..fa13db6 100644 --- a/Porting/pumpkin.pod +++ b/Porting/pumpkin.pod @@ -505,7 +505,8 @@ Note that in the old days, you had to do C<make run_byacc> instead. =head2 make regen_all -This target takes care of the regen_headers, and regen_pods targets. +This target takes care of the regen_headers target. +(It used to also call the regen_pods target, but that has been eliminated.) =head2 make regen_headers @@ -532,10 +533,6 @@ and effort by manually running C<make regen_headers> myself rather than answering all the questions and complaints about the failing command. -=head2 make regen_pods - -Will run `make regen_pods` in the pod directory for indexing. - =head2 global.sym, interp.sym and perlio.sym Make sure these files are up-to-date. Read the comments in these diff --git a/pod/Makefile.SH b/pod/Makefile.SH index 0dd799b..1d53de7 100644 --- a/pod/Makefile.SH +++ b/pod/Makefile.SH @@ -71,10 +71,6 @@ all: $(CONVERTERS) man converters: $(CONVERTERS) -regen_pods: perlmodlib.pod toc - -perltoc.pod: buildtoc - man: pod2man $(MAN) html: pod2html $(HTML) @@ -151,8 +147,4 @@ podchecker: podchecker.PL ../lib/Config.pm podselect: podselect.PL ../lib/Config.pm $(PERL) -I ../lib podselect.PL -perlmodlib.pod: $(PERL) perlmodlib.PL ../MANIFEST - rm -f perlmodlib.pod - $(PERL) -I ../lib perlmodlib.PL - !NO!SUBS! diff --git a/regen.pl b/regen.pl index 48700f5..15c86ca 100644 --- a/regen.pl +++ b/regen.pl @@ -19,9 +19,7 @@ my $perl = $^X; # safer_unlink ("warnings.h", "lib/warnings.pm"); # Which scripts to run. Note the ordering: embed.pl must run after -# opcode.pl, since it depends on pp.sym, and autodoc.pl should run last as -# it reads all *.[ch] files, some of which may have been changed by other -# scripts (eg reentr.c) +# opcode.pl, since it depends on pp.sym my @scripts = qw( warnings.pl @@ -31,7 +29,6 @@ overload.pl opcode.pl keywords.pl embed.pl -autodoc.pl ); # Which files are (re)generated by each script. @@ -39,7 +36,6 @@ autodoc.pl # now generated by regen_lib.pl, so should we just drop them? my %gen = ( - 'autodoc.pl' => [qw[pod/perlapi.pod pod/perlintern.pod]], 'embed.pl' => [qw[proto.h embed.h embedvar.h global.sym perlapi.h perlapi.c]], 'keywords.pl' => [qw[keywords.h]], -- Perl5 Master Repository
