Change 25408 by [EMAIL PROTECTED] on 2005/09/13 22:19:30
Integrate:
[ 24443]
"make regen" should run reentr.pl
[ 24774]
reentr.pl should be using regen_lib.pl and unlinking files before it
starts.
[ 24775]
Change perforce filetype from text to text+w (so regen.pl is happy)
[ 25059]
Stop reentr.pl changing EOL on the files it writes on Win32
Affected files ...
... //depot/maint-5.8/perl/opnames.h#6 integrate
... //depot/maint-5.8/perl/reentr.c#14 integrate
... //depot/maint-5.8/perl/reentr.h#15 integrate
... //depot/maint-5.8/perl/reentr.inc#9 edit
... //depot/maint-5.8/perl/reentr.pl#22 integrate
... //depot/maint-5.8/perl/regen.pl#3 integrate
Differences ...
==== //depot/maint-5.8/perl/reentr.pl#22 (text) ====
Index: perl/reentr.pl
--- perl/reentr.pl#21~24464~ Fri May 13 12:49:02 2005
+++ perl/reentr.pl Tue Sep 13 15:19:30 2005
@@ -5,6 +5,11 @@
# and optionally also the relevant metaconfig units (-U option).
#
+BEGIN {
+ # Get function prototypes
+ require 'regen_lib.pl';
+}
+
use strict;
use Getopt::Std;
my %opts;
@@ -35,7 +40,9 @@
# Example #3: S_CBI means type func_r(const char*, char*, int)
+safer_unlink 'reentr.h';
die "reentr.h: $!" unless open(H, ">reentr.h");
+binmode H;
select H;
print <<EOF;
/*
@@ -173,6 +180,7 @@
# If given the -U option open up the metaconfig unit for this function.
if ($opts{U} && open(U, ">d_${func}_r.U")) {
+ binmode U;
select U;
}
@@ -847,7 +855,9 @@
# Prepare to write the reentr.c.
+safer_unlink 'reentr.c';
die "reentr.c: $!" unless open(C, ">reentr.c");
+binmode C;
select C;
print <<EOF;
/*
==== //depot/maint-5.8/perl/regen.pl#3 (text) ====
Index: perl/regen.pl
--- perl/regen.pl#2~18866~ Sun Mar 9 05:59:01 2003
+++ perl/regen.pl Tue Sep 13 15:19:30 2005
@@ -26,7 +26,8 @@
'keywords.pl' => [qw[keywords.h]],
'opcode.pl' => [qw[opcode.h opnames.h pp_proto.h pp.sym]],
'regcomp.pl' => [qw[regnodes.h]],
- 'warnings.pl' => [qw[warnings.h lib/warnings.pm]]
+ 'warnings.pl' => [qw[warnings.h lib/warnings.pm]],
+ 'reentr.pl' => [qw[reentr.c reentr.h]],
);
sub do_cksum {
@@ -46,7 +47,7 @@
}
foreach my $pl (qw (keywords.pl opcode.pl embed.pl bytecode.pl
- regcomp.pl warnings.pl autodoc.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
End of Patch.
