NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitddac64f

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 parentf4a4200 commitddac64fCopy full SHA for ddac64f

File tree

1 file changed

-1

lines changed

src/tools/msvc
- VSObjectFactory.pm

1 file changed

-1

lines changed

`‎src/tools/msvc/VSObjectFactory.pm`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ sub DetermineVisualStudioVersion`
`150`	`150`	`$? >> 8 == 0`
`151`	`151`	`or croak`
`152`	`152`	`"Unable to determine Visual Studio version: The nmake command wasn't found.";`
`153`		`-if ($output =~/(\d+)\.(\d+)\.\d+(\.\d+)?$/m)`
	`153`	`+if ($output =~/(\d+)\.(\d+)\.\d+(\.\d+)?/)`
`154`	`154`	`{`
`155`	`155`	`return _GetVisualStudioVersion($1,$2);`
`156`	`156`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitddac64f

File tree

1 file changed

1 file changed

`‎src/tools/msvc/VSObjectFactory.pm`

0 commit comments