Change 14987 by ams@lustre on 2002/03/04 08:48:11
Subject: [PATCH @14577] perly-fixer
From: Ilya Zakharevich <[EMAIL PROTECTED]>
Date: Mon, 4 Mar 2002 02:28:51 -0500
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/Makefile.SH#232 edit
.... //depot/perl/perly.fixer#11 edit
Differences ...
==== //depot/perl/Makefile.SH#232 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH.~1~ Mon Mar 4 02:00:06 2002
+++ perl/Makefile.SH Mon Mar 4 02:00:06 2002
@@ -770,7 +770,7 @@
-e 's/y\.tab/perly/g' perly.c >perly.tmp && mv perly.tmp perly.c
sed -e '/^extern YYSTYPE yy/D' y.tab.h >yh.tmp && mv yh.tmp y.tab.h
cmp -s y.tab.h perly.h && rm -f y.tab.h || mv y.tab.h perly.h
- perl -i perlyline.pl perly.c
+ perl -i.old perlyline.pl perly.c
chmod 664 vms/perly_c.vms vms/perly_h.vms
perl vms/vms_yfix.pl perly.c perly.h vms/perly_c.vms vms/perly_h.vms
==== //depot/perl/perly.fixer#11 (xtext) ====
Index: perl/perly.fixer
--- perl/perly.fixer.~1~ Mon Mar 4 02:00:06 2002
+++ perl/perly.fixer Mon Mar 4 02:00:06 2002
@@ -18,6 +18,9 @@
# Also edit some practices gcc -Wall finds questionable.
#
+gnupatch=patch
+. config.sh
+
input=$1
output=$2
tmp=/tmp/f$$
@@ -37,7 +40,7 @@
cp $input $output
# Don't expect the diff to do everything -- do some by hand
if test -f perly_c.diff; then
- patch -F3 $output <perly_c.diff
+ $gnupatch -F3 $output <perly_c.diff
sed -e '/^[ ]*printf("yydebug:/s/printf(/PerlIO_printf(Perl_debug_log, /' \
-e '/^#line /s/"y[.]tab[.]c"/"perly.c"/' \
-e '/\[\] *= *[{]/s/^/static /' \
@@ -57,7 +60,7 @@
exit
elif grep 'yaccpar 1.9 (Berkeley)' $input >/dev/null 2>&1; then
if test -f perly.c.dif9; then
- patch -F3 $output <perly.c.dif9
+ $gnupatch -F3 $output <perly.c.dif9
sed -e '/^[ ]*printf("yydebug:/s/printf(/PerlIO_printf(Perl_debug_log, /' \
-e '/^#line /s/"y[.]tab[.]c"/"perly.c"/' \
-e '/\[\] *= *[{]/s/^/static /' \
End of Patch.
