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

Commit592123e

Browse files
committed
Unify searchpath and do file logic in MSVC build scripts.
Commitf83419b failed to notice that mkvcbuild.pl and build.pl usedifferent searchpath and do-file logic, breaking the latter, so it isadjusted to use the same logic as mkvcbuild.pl.
1 parent171e041 commit592123e

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

‎src/tools/msvc/build.pl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44

55
use strict;
66

7-
BEGIN
8-
{
9-
10-
chdir("../../..")if (-d"../msvc" &&-d"../../../src");
11-
12-
}
13-
14-
use lib"src/tools/msvc";
7+
use File::Basename;
8+
use File::Spec;
9+
BEGIN {use lib File::Spec->rel2abs(dirname(__FILE__)); }
1510

1611
use Cwd;
1712

1813
use Mkvcbuild;
1914

15+
chdir('..\..\..')if (-d'..\msvc' &&-d'..\..\..\src');
16+
die'Must run from root or msvc directory'
17+
unless (-d'src\tools\msvc' &&-d'src');
18+
2019
# buildenv.pl is for specifying the build environment settings
2120
# it should contain lines like:
2221
# $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
@@ -32,8 +31,8 @@ BEGIN
3231

3332
# set up the project
3433
our$config;
35-
do"./config_default.pl";
36-
do"./config.pl"if (-f"src/tools/msvc/config.pl");
34+
do"./src/tools/msvc/config_default.pl";
35+
do"./src/tools/msvc/config.pl"if (-f"src/tools/msvc/config.pl");
3736

3837
my$vcver = Mkvcbuild::mkvcbuild($config);
3938

0 commit comments

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