postgres.git / summary / log / commit / refs
commit 2689e8e3345628a2fe42e5bfcb45fdbbaff04fbc
Author: Andrew Dunstan <andrew@dunslane.net>
Date: Tue Feb 05 23:57:12 2019 +0000
First released in: 12.0, 9.4.21, 9.5.16, 9.6.12, 10.7, 11.2
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.
src/tools/msvc/Install.pm | 4 ++--
src/tools/msvc/build.pl | 6 +++---
src/tools/msvc/install.pl | 2 +-
src/tools/msvc/mkvcbuild.pl | 4 ++--
src/tools/msvc/pgbison.pl | 2 +-
src/tools/msvc/pgflex.pl | 2 +-
src/tools/msvc/vcregress.pl | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 3e32d019553..c016eafb5ec 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';
- 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 dc9818cab62..09bd55821ab 100644
--- 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 90425ca8fc6..47cdba35361 100755
--- 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 34e861375c0..f5505b98c26 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;
-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 086a07ddf66..7d0f784aa83 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
-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 22b71ce2371..68222256b77 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
-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 babe7463669..0a6c43b5c4d 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";
-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 || "";
[parent: 7a3763318e06]