mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a slightly more liberal regex to detect Visual Studio version

Browse Source 
Apparently in some language versions of Visual Studio nmake outputs some
material after the version number and before the end of the line. This
has been seen in Chinese versions. Therefore, we no longer demand that
the version string comes at the end of a line.

Per complaint from Cuiping Lin.

Backpatch to all live branches.
This commit is contained in:
Andrew Dunstan 2020-04-17 14:44:33 -04:00
parent 9e24109f1a
commit a9659fb654
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/msvc/VSObjectFactory.pm
View File

@ -120,7 +120,7 @@ sub DetermineVisualStudioVersion
$? >> 8 == 0 $? >> 8 == 0
or croak or croak
"Unable to determine Visual Studio version: The nmake command wasn't found."; "Unable to determine Visual Studio version: The nmake command wasn't found.";
if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?$/m) if ($output =~ /(\d+)\.(\d+)\.\d+(\.\d+)?/)
{ {
return _GetVisualStudioVersion($1, $2); return _GetVisualStudioVersion($1, $2);
} }