Commitf1229bd

dse

committed

Fix for the#539 classic build fails when VS 2017 installed.

1 parent319dfe4 commitf1229bdCopy full SHA for f1229bd

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,20 @@ def _install_packages(self):`
`324`	`324`
`325`	`325`	`def_find_msbuild_tool(self,tool="msbuild.exe",use_windows_sdk=False):`
`326`	`326`	`"""Return full path to one of the Microsoft build tools"""`
	`327`	`+`
	`328`	`+# trying to search path with help of vswhere when MSBuild 15.0 and higher installed.`
	`329`	`+ifuse_windows_sdk==False:`
	`330`	`+try:`
	`331`	`+basePathes=subprocess.check_output(`
	`332`	`+ ["tools\\vswhere\\vswhere.exe","-latest",`
	`333`	`+"-version","[15.0, 16.0)",`
	`334`	`+"-requires","Microsoft.Component.MSBuild",`
	`335`	`+"-property","InstallationPath"]).splitlines()`
	`336`	`+iflen(basePathes):`
	`337`	`+returnos.path.join(basePathes[0].decode(sys.stdout.encodingor"utf-8"),"MSBuild","15.0","Bin","MSBuild.exe")`
	`338`	`+except:`
	`339`	`+pass# keep trying to search by old method.`
	`340`	`+`
`327`	`341`	`# Search in PATH first`
`328`	`342`	`path=spawn.find_executable(tool)`
`329`	`343`	`ifpath:`

Comments

(0)