Use a slightly more liberal regex to detect Visual Studio version

adunstan · adunstan · commit 758814224c8c · 2020-04-17T14:53:56.000-04:00
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.
diff --git a/src/tools/msvc/VSObjectFactory.pm b/src/tools/msvc/VSObjectFactory.pm
@@ -152,7 +152,7 @@ sub DetermineVisualStudioVersion
 	$? >> 8 == 0
 	  or croak
 	  "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);
 	}

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