Fix included file path for modern perl

adunstan · adunstan · commit f83419b7396f · 2019-02-05T19:27:47.000-05:00
Contrary to the comment on 772d4b7, only paths starting with "./" or "../" are considered relative to the current working directory by perl's "do" function. So this patch converts all the relevant cases to use "./" paths. This only affects MSVC. Backpatch to all live branches.
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -59,8 +59,8 @@ sub Install
 
 		# suppress warning about harmless redeclaration of $config
 		no warnings 'misc';
-		do "config_default.pl";
-		do "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
@@ -23,7 +23,7 @@ BEGIN
 
 if (-e "src/tools/msvc/buildenv.pl")
 {
-	do "src/tools/msvc/buildenv.pl";
+	do "./src/tools/msvc/buildenv.pl";
 }
 elsif (-e "./buildenv.pl")
 {
@@ -32,8 +32,8 @@ BEGIN
 
 # set up the project
 our $config;
-do "config_default.pl";
-do "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/install.pl b/src/tools/msvc/install.pl
@@ -18,7 +18,7 @@
 
 if (-e "src/tools/msvc/buildenv.pl")
 {
-	do "src/tools/msvc/buildenv.pl";
+	do "./src/tools/msvc/buildenv.pl";
 }
 elsif (-e "./buildenv.pl")
 {
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;
-do 'src/tools/msvc/config_default.pl';
-do '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
 
-do '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
 
-do '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
@@ -23,16 +23,16 @@
 my $topdir         = getcwd();
 my $tmp_installdir = "$topdir/tmp_install";
 
-do 'src/tools/msvc/config_default.pl';
-do '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")
 {
-	do "src/tools/msvc/buildenv.pl";
+	do "./src/tools/msvc/buildenv.pl";
 }
 
 my $what = shift || "";

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