Commit 5b3a2ca8 authored by Tom Lane's avatar Tom Lane

Dept of second thoughts: rename new perl script.

It didn't take long at all for me to become irritated that the original
choice of name for this script resulted in "warning" showing up in several
places in build logs, because I tend to grep for that.  Change the script
name to avoid that.
parent 170511b3
...@@ -627,7 +627,7 @@ TAS = @TAS@ ...@@ -627,7 +627,7 @@ TAS = @TAS@
ifdef FLEX ifdef FLEX
$(FLEX) $(if $(FLEX_NO_BACKUP),-b) $(FLEXFLAGS) -o'$@' $< $(FLEX) $(if $(FLEX_NO_BACKUP),-b) $(FLEXFLAGS) -o'$@' $<
@$(if $(FLEX_NO_BACKUP),if [ `wc -l <lex.backup` -eq 1 ]; then rm lex.backup; else echo "Scanner requires backup; see lex.backup." 1>&2; exit 1; fi) @$(if $(FLEX_NO_BACKUP),if [ `wc -l <lex.backup` -eq 1 ]; then rm lex.backup; else echo "Scanner requires backup; see lex.backup." 1>&2; exit 1; fi)
$(if $(FLEX_FIX_WARNING),$(PERL) $(top_srcdir)/src/tools/fix-flex-warning.pl '$@') $(if $(FLEX_FIX_WARNING),$(PERL) $(top_srcdir)/src/tools/fix-old-flex-code.pl '$@')
else else
@$(missing) flex $< '$@' @$(missing) flex $< '$@'
endif endif
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# #
# fix-flex-warning.pl # fix-old-flex-code.pl
# #
# flex versions before 2.5.36, with certain option combinations, produce # flex versions before 2.5.36, with certain option combinations, produce
# code that causes an "unused variable" warning. That's annoying, so # code that causes an "unused variable" warning. That's annoying, so
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# src/tools/fix-flex-warning.pl # src/tools/fix-old-flex-code.pl
# #
#---------------------------------------------------------------------- #----------------------------------------------------------------------
...@@ -55,9 +55,9 @@ exit 0; ...@@ -55,9 +55,9 @@ exit 0;
sub usage sub usage
{ {
die <<EOM; die <<EOM;
Usage: fix-flex-warning.pl c-file-name Usage: fix-old-flex-code.pl c-file-name
fix-flex-warning.pl modifies a flex output file to suppress fix-old-flex-code.pl modifies a flex output file to suppress
an unused-variable warning that occurs with older flex versions. an unused-variable warning that occurs with older flex versions.
Report bugs to <pgsql-bugs\@postgresql.org>. Report bugs to <pgsql-bugs\@postgresql.org>.
......
...@@ -60,7 +60,7 @@ if ($? == 0) ...@@ -60,7 +60,7 @@ if ($? == 0)
{ {
# Reentrant scanners usually need a fix to prevent # Reentrant scanners usually need a fix to prevent
# "unused variable" warnings with older flex versions. # "unused variable" warnings with older flex versions.
system("perl src\\tools\\fix-flex-warning.pl $output"); system("perl src\\tools\\fix-old-flex-code.pl $output");
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment