More fixed for modern perl on back branches

adunstan · adunstan · commit 772d4b769d30 · 2019-02-05T18:31:10.000-05:00
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.
diff --git 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
@@ -21,17 +21,17 @@ BEGIN
 
 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
@@ -18,7 +18,7 @@
 
 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
@@ -18,11 +18,11 @@
 
 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
@@ -23,7 +23,7 @@
   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
@@ -7,7 +7,7 @@
 
 # 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
@@ -10,7 +10,7 @@
 
 # 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
@@ -22,16 +22,16 @@
 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:
 # $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
 
 if (-e "src/tools/msvc/buildenv.pl")
 {
-	require "src/tools/msvc/buildenv.pl";
+	do "src/tools/msvc/buildenv.pl";
 }
 
 my $what = shift || "";

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ sub Install`
`58`	`58`
`59`	`59`	`# suppress warning about harmless redeclaration of $config`
`60`	`60`	`no warnings 'misc';`
`61`		`- require "config_default.pl";`
`62`		`- require "config.pl" if (-f "config.pl");`
	`61`	`+ do "config_default.pl";`
	`62`	`+ do "config.pl" if (-f "config.pl");`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`chdir("../../..") if (-f "../../../configure");`
Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,17 @@ BEGIN`
`21`	`21`
`22`	`22`	`if (-e "src/tools/msvc/buildenv.pl")`
`23`	`23`	`{`
`24`		`- require "src/tools/msvc/buildenv.pl";`
	`24`	`+ do "src/tools/msvc/buildenv.pl";`
`25`	`25`	`}`
`26`	`26`	`elsif (-e "./buildenv.pl")`
`27`	`27`	`{`
`28`		`- require "./buildenv.pl";`
	`28`	`+ do "./buildenv.pl";`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`# set up the project`
`32`	`32`	`our $config;`
`33`		`-require "config_default.pl";`
`34`		`-require "config.pl" if (-f "src/tools/msvc/config.pl");`
	`33`	`+do "config_default.pl";`
	`34`	`+do "config.pl" if (-f "src/tools/msvc/config.pl");`
`35`	`35`
`36`	`36`	`my $vcver = Mkvcbuild::mkvcbuild($config);`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@`
`18`	`18`
`19`	`19`	`if (-e "src/tools/msvc/buildenv.pl")`
`20`	`20`	`{`
`21`		`- require "src/tools/msvc/buildenv.pl";`
	`21`	`+ do "src/tools/msvc/buildenv.pl";`
`22`	`22`	`}`
`23`	`23`	`elsif (-e "./buildenv.pl")`
`24`	`24`	`{`
`25`		`- require "./buildenv.pl";`
	`25`	`+ do "./buildenv.pl";`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`my $target = shift \|\| Usage();`