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

Commita9659fb

Browse files
committed
Use a slightly more liberal regex to detect Visual Studio version
Apparently in some language versions of Visual Studio nmake outputs somematerial after the version number and before the end of the line. Thishas been seen in Chinese versions. Therefore, we no longer demand thatthe version string comes at the end of a line.Per complaint from Cuiping Lin.Backpatch to all live branches.
1 parent9e24109 commita9659fb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/tools/msvc/VSObjectFactory.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ sub DetermineVisualStudioVersion
120120
$? >> 8 == 0
121121
or croak
122122
"Unable to determine Visual Studio version: The nmake command wasn't found.";
123-
if ($output =~/(\d+)\.(\d+)\.\d+(\.\d+)?$/m)
123+
if ($output =~/(\d+)\.(\d+)\.\d+(\.\d+)?/)
124124
{
125125
return _GetVisualStudioVersion($1,$2);
126126
}

0 commit comments

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