Fix included file path for modern perl

Contrary to the comment on 772d4b76, 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
index 3e32d019553d8d74ac79b95d6280d2fcf0237d48..c016eafb5ecc36970c0a6cf74c1a3432a1364ab2 100644 (file)
--- 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';
-       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
index dc9818cab6220e9257ef85c3578789c55cd409d3..09bd55821ab14663491c656cf0fc5cfad3a0da7f 100644 (file)
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -21,7 +21,7 @@ use Mkvcbuild;
 
 if (-e "src/tools/msvc/buildenv.pl")
 {
-   do "src/tools/msvc/buildenv.pl";
+   do "./src/tools/msvc/buildenv.pl";
 }
 elsif (-e "./buildenv.pl")
 {
@@ -30,8 +30,8 @@ elsif (-e "./buildenv.pl")
 
 # 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
index 90425ca8fc68ebe70cfe41031f8c846d421ae67f..47cdba35361e6d0d464c5c86df2c430178881171 100755 (executable)
--- a/src/tools/msvc/install.pl
+++ b/src/tools/msvc/install.pl
@@ -18,7 +18,7 @@ use Install qw(Install);
 
 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
index 34e861375c00652c272e035806627bd922603a31..f5505b98c26841a7613bec42e86554468099136f 100644 (file)
--- 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;
-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
index 086a07ddf6632c44dc375755db44f3ae0da07133..7d0f784aa834f7e17e4075371a769eedcfa10d17 100644 (file)
--- 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
 
-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
index 22b71ce2371b0d7c81d9002fec0744df40bd41cd..68222256b77de0ff2593abbb43f1e166674e6843 100644 (file)
--- 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
 
-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
index babe74636691c44145342543f31c985d8d3fb947..0a6c43b5c4d133f79c6098b21b28d26805c8fb6f 100644 (file)
--- 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";
 
-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:
@@ -31,7 +31,7 @@ do 'src/tools/msvc/config.pl' if (-f 'src/tools/msvc/config.pl');
 
 if (-e "src/tools/msvc/buildenv.pl")
 {
-   do "src/tools/msvc/buildenv.pl";
+   do "./src/tools/msvc/buildenv.pl";
 }
 
 my $what = shift || "";