import perl 5.10.1

1 files changed, 27 insertions, 21 deletions

diff --git a/gnu/usr.bin/perl/regen.pl b/gnu/usr.bin/perl/regen.pl
index a1f1ab8d877..15c86ca956f 100644
--- a/gnu/usr.bin/perl/regen.pl
+++ b/gnu/usr.bin/perl/regen.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl -w
+#
+# regen.pl - a wrapper that runs all *.pl scripts to to autogenerate files
+
 require 5.003;	# keep this compatible, an old perl is all we may have before
                 # we build the new one
 
@@ -11,13 +14,28 @@ require 5.003;	# keep this compatible, an old perl is all we may have before
 use strict;
 my $perl = $^X;
 
-require 'regen_lib.pl';
 # keep warnings.pl in sync with the CPAN distribution by not requiring core
-# changes
-safer_unlink ("warnings.h", "lib/warnings.pm");
+# changes.  Um, what ?
+# 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
+
+my @scripts = qw(
+warnings.pl
+regcomp.pl
+reentr.pl
+overload.pl
+opcode.pl
+keywords.pl
+embed.pl
+);
+
+# Which files are (re)generated by each script.
+# *** We no longer need these values, as the "changed" message is
+# 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]],
@@ -25,7 +43,7 @@ my %gen = (
 	   'regcomp.pl'  => [qw[regnodes.h]],
 	   'warnings.pl' => [qw[warnings.h lib/warnings.pm]],
 	   'reentr.pl'   => [qw[reentr.c reentr.h]],
-	   'overload.pl' => [qw[overload.h]],
+	   'overload.pl' => [qw[overload.c overload.h lib/overload/numbers.pm]],
 	   );
 
 sub do_cksum {
@@ -44,20 +62,8 @@ sub do_cksum {
     return %cksum;
 }
 
-foreach my $pl (qw (keywords.pl opcode.pl embed.pl
-		    regcomp.pl warnings.pl autodoc.pl reentr.pl)) {
-  print "$^X $pl\n";
-  my %cksum0;
-  %cksum0 = do_cksum($pl) unless $pl eq 'warnings.pl'; # the files were removed
-  system "$^X $pl";
-  next if $pl eq 'warnings.pl'; # the files were removed
-  my %cksum1 = do_cksum($pl);
-  my @chg;
-  for my $f (@{ $gen{$pl} }) {
-      push(@chg, $f)
-	  if !defined($cksum0{$f}) ||
-	     !defined($cksum1{$f}) ||
-	     $cksum0{$f} ne $cksum1{$f};
-  }
-  print "Changed: @chg\n" if @chg;
+foreach my $pl (@scripts) {
+  my @command =  ($^X, $pl, @ARGV);
+  print "@command\n";
+  system @command;
 }