From 772d4b769d30090dbf4434d7d192569b11371a53 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Tue, 5 Feb 2019 18:31:10 -0500 Subject: [PATCH] More fixed for modern perl on back branches Use "do" instead of "require" for included files, as it doesn't look for them in the search path but relative to the current working directory. These changes have already been made to REL_10_STABLE and later, to satisfy the demands of perlcritic, but need backporting now to earlier branches. --- src/tools/msvc/Install.pm | 4 ++-- src/tools/msvc/build.pl | 8 ++++---- src/tools/msvc/builddoc.pl | 2 +- src/tools/msvc/install.pl | 4 ++-- src/tools/msvc/mkvcbuild.pl | 4 ++-- src/tools/msvc/pgbison.pl | 2 +- src/tools/msvc/pgflex.pl | 2 +- src/tools/msvc/vcregress.pl | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index abe961f8b0..1eb59091cf 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -58,8 +58,8 @@ sub Install # suppress warning about harmless redeclaration of $config no warnings 'misc'; - require "config_default.pl"; - require "config.pl" if (-f "config.pl"); + do "config_default.pl"; + do "config.pl" if (-f "config.pl"); } chdir("../../..") if (-f "../../../configure"); diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl index 007e3c73b2..2846ed5f16 100644 --- a/src/tools/msvc/build.pl +++ b/src/tools/msvc/build.pl @@ -21,17 +21,17 @@ use Mkvcbuild; if (-e "src/tools/msvc/buildenv.pl") { - require "src/tools/msvc/buildenv.pl"; + do "src/tools/msvc/buildenv.pl"; } elsif (-e "./buildenv.pl") { - require "./buildenv.pl"; + do "./buildenv.pl"; } # set up the project our $config; -require "config_default.pl"; -require "config.pl" if (-f "src/tools/msvc/config.pl"); +do "config_default.pl"; +do "config.pl" if (-f "src/tools/msvc/config.pl"); my $vcver = Mkvcbuild::mkvcbuild($config); diff --git a/src/tools/msvc/builddoc.pl b/src/tools/msvc/builddoc.pl index 2b56ced43c..e0b5c50b34 100644 --- a/src/tools/msvc/builddoc.pl +++ b/src/tools/msvc/builddoc.pl @@ -18,7 +18,7 @@ chdir '../../..' if (-d '../msvc' && -d '../../../src'); noversion() unless -e 'doc/src/sgml/version.sgml'; -require 'src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; +do 'src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; my $docroot = $ENV{DOCROOT}; die "bad DOCROOT '$docroot'" unless ($docroot && -d $docroot); diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl index d7b7c7ee61..90425ca8fc 100755 --- a/src/tools/msvc/install.pl +++ b/src/tools/msvc/install.pl @@ -18,11 +18,11 @@ use Install qw(Install); if (-e "src/tools/msvc/buildenv.pl") { - require "src/tools/msvc/buildenv.pl"; + do "src/tools/msvc/buildenv.pl"; } elsif (-e "./buildenv.pl") { - require "./buildenv.pl"; + do "./buildenv.pl"; } my $target = shift || Usage(); diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl index 748b0eb415..34e861375c 100644 --- a/src/tools/msvc/mkvcbuild.pl +++ b/src/tools/msvc/mkvcbuild.pl @@ -23,7 +23,7 @@ print "Warning: no config.pl found, using default.\n" unless (-f 'src/tools/msvc/config.pl'); our $config; -require 'src/tools/msvc/config_default.pl'; -require 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl'); +do 'src/tools/msvc/config_default.pl'; +do 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl'); Mkvcbuild::mkvcbuild($config); diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl index 31e75403f5..086a07ddf6 100644 --- a/src/tools/msvc/pgbison.pl +++ b/src/tools/msvc/pgbison.pl @@ -7,7 +7,7 @@ use File::Basename; # assume we are in the postgres source root -require 'src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; +do 'src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; my ($bisonver) = `bison -V`; # grab first line $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl index 474ce63e5c..ba80622a17 100644 --- a/src/tools/msvc/pgflex.pl +++ b/src/tools/msvc/pgflex.pl @@ -10,7 +10,7 @@ use File::Basename; # assume we are in the postgres source root -require 'src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; +do 'src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; my ($flexver) = `flex -V`; # grab first line $flexver = (split(/\s+/, $flexver))[1]; diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 3462144731..a27fb0f2df 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -22,8 +22,8 @@ chdir "../../.." if (-d "../../../src/tools/msvc"); my $topdir = getcwd(); my $tmp_installdir = "$topdir/tmp_install"; -require 'src/tools/msvc/config_default.pl'; -require 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl'); +do 'src/tools/msvc/config_default.pl'; +do 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl'); # buildenv.pl is for specifying the build environment settings # it should contain lines like: @@ -31,7 +31,7 @@ require 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl'); if (-e "src/tools/msvc/buildenv.pl") { - require "src/tools/msvc/buildenv.pl"; + do "src/tools/msvc/buildenv.pl"; } my $what = shift || ""; -- 2.40.0