Skip to content
Snippets Groups Projects
Commit 1a624421 authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

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.
parent 17120710
No related branches found
Tags
No related merge requests found
......@@ -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");
......
......@@ -23,7 +23,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")
{
......@@ -32,8 +32,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);
......
......@@ -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")
{
......
......@@ -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);
......@@ -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
......
......@@ -10,7 +10,7 @@ $ENV{CYGWIN} = 'nodosfilewarning';
# 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];
......
......@@ -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 || "";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment