Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit77173d0

Browse files
committed
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.
1 parent99eb3bb commit77173d0

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

‎src/tools/msvc/Install.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ sub Install
5959

6060
# suppress warning about harmless redeclaration of $config
6161
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");
6464
}
6565

6666
chdir("../../..")if (-f"../../../configure");

‎src/tools/msvc/build.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ BEGIN
2323

2424
if (-e"src/tools/msvc/buildenv.pl")
2525
{
26-
do"src/tools/msvc/buildenv.pl";
26+
do"./src/tools/msvc/buildenv.pl";
2727
}
2828
elsif (-e"./buildenv.pl")
2929
{
@@ -32,8 +32,8 @@ BEGIN
3232

3333
# set up the project
3434
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");
3737

3838
my$vcver = Mkvcbuild::mkvcbuild($config);
3939

‎src/tools/msvc/install.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
if (-e"src/tools/msvc/buildenv.pl")
2020
{
21-
do"src/tools/msvc/buildenv.pl";
21+
do"./src/tools/msvc/buildenv.pl";
2222
}
2323
elsif (-e"./buildenv.pl")
2424
{

‎src/tools/msvc/mkvcbuild.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
unless (-f'src/tools/msvc/config.pl');
2424

2525
our$config;
26-
do'src/tools/msvc/config_default.pl';
27-
do'src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
26+
do'./src/tools/msvc/config_default.pl';
27+
do'./src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
2828

2929
Mkvcbuild::mkvcbuild($config);

‎src/tools/msvc/pgbison.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# assume we are in the postgres source root
99

10-
do'src/tools/msvc/buildenv.pl'if-e'src/tools/msvc/buildenv.pl';
10+
do'./src/tools/msvc/buildenv.pl'if-e'src/tools/msvc/buildenv.pl';
1111

1212
my ($bisonver) =`bison -V`;# grab first line
1313
$bisonver = (split(/\s+/,$bisonver))[3];# grab version number

‎src/tools/msvc/pgflex.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# assume we are in the postgres source root
1212

13-
do'src/tools/msvc/buildenv.pl'if-e'src/tools/msvc/buildenv.pl';
13+
do'./src/tools/msvc/buildenv.pl'if-e'src/tools/msvc/buildenv.pl';
1414

1515
my ($flexver) =`flex -V`;# grab first line
1616
$flexver = (split(/\s+/,$flexver))[1];

‎src/tools/msvc/vcregress.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
my$topdir = getcwd();
2424
my$tmp_installdir ="$topdir/tmp_install";
2525

26-
do'src/tools/msvc/config_default.pl';
27-
do'src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
26+
do'./src/tools/msvc/config_default.pl';
27+
do'./src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
2828

2929
# buildenv.pl is for specifying the build environment settings
3030
# it should contain lines like:
3131
# $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
3232

3333
if (-e"src/tools/msvc/buildenv.pl")
3434
{
35-
do"src/tools/msvc/buildenv.pl";
35+
do"./src/tools/msvc/buildenv.pl";
3636
}
3737

3838
my$what =shift ||"";

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp