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

Commit772d4b7

Browse files
committed
More fixed for modern perl on back branches
Use "do" instead of "require" for included files, as it doesn't look forthem in the search path but relative to the current working directory.These changes have already been made to REL_10_STABLE and later, tosatisfy the demands of perlcritic, but need backporting now to earlierbranches.
1 parent749cb71 commit772d4b7

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎src/tools/msvc/Install.pm

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

5959
# suppress warning about harmless redeclaration of $config
6060
no warnings'misc';
61-
require"config_default.pl";
62-
require"config.pl"if (-f"config.pl");
61+
do"config_default.pl";
62+
do"config.pl"if (-f"config.pl");
6363
}
6464

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

‎src/tools/msvc/build.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ BEGIN
2121

2222
if (-e"src/tools/msvc/buildenv.pl")
2323
{
24-
require"src/tools/msvc/buildenv.pl";
24+
do"src/tools/msvc/buildenv.pl";
2525
}
2626
elsif (-e"./buildenv.pl")
2727
{
28-
require"./buildenv.pl";
28+
do"./buildenv.pl";
2929
}
3030

3131
# set up the project
3232
our$config;
33-
require"config_default.pl";
34-
require"config.pl"if (-f"src/tools/msvc/config.pl");
33+
do"config_default.pl";
34+
do"config.pl"if (-f"src/tools/msvc/config.pl");
3535

3636
my$vcver = Mkvcbuild::mkvcbuild($config);
3737

‎src/tools/msvc/builddoc.pl

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

1919
noversion()unless-e'doc/src/sgml/version.sgml';
2020

21-
require'src/tools/msvc/buildenv.pl'if-e'src/tools/msvc/buildenv.pl';
21+
do'src/tools/msvc/buildenv.pl'if-e'src/tools/msvc/buildenv.pl';
2222

2323
my$docroot =$ENV{DOCROOT};
2424
die"bad DOCROOT '$docroot'"unless ($docroot &&-d$docroot);

‎src/tools/msvc/install.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

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

2828
my$target =shift || Usage();

‎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-
require'src/tools/msvc/config_default.pl';
27-
require'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-
require'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-
require'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
@@ -22,16 +22,16 @@
2222
my$topdir = getcwd();
2323
my$tmp_installdir ="$topdir/tmp_install";
2424

25-
require'src/tools/msvc/config_default.pl';
26-
require'src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
25+
do'src/tools/msvc/config_default.pl';
26+
do'src/tools/msvc/config.pl'if (-f'src/tools/msvc/config.pl');
2727

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

3232
if (-e"src/tools/msvc/buildenv.pl")
3333
{
34-
require"src/tools/msvc/buildenv.pl";
34+
do"src/tools/msvc/buildenv.pl";
3535
}
3636

3737
my$what =shift ||"";

0 commit comments

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