Skip to content

Commit 894adc1

Browse files
zoobazooba
authored
bpo-39930: Fix MSBuild detection for Build Tools (pythonGH-18938)
Ensure we detect Build Tools installs using the newer logic, and skip looking in the registry for VS 2017.
1 parent 196f1eb commit 894adc1

2 files changed

Lines changed: 27 additions & 16 deletions

File tree

‎PCbuild/find_msbuild.bat‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,13 @@
3232
@rem VS 2017 and later provide vswhere.exe, which can be used
3333
@if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto :skip_vswhere
3434
@set _Py_MSBuild_Root=
35-
@for /F "tokens=*" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -property installationPath -latest -prerelease') DO @(set _Py_MSBuild_Root=%%i\MSBuild)
35+
@for /F "tokens=*" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -property installationPath -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64') DO @(set _Py_MSBuild_Root=%%i\MSBuild)
3636
@if not defined _Py_MSBuild_Root goto :skip_vswhere
3737
@for %%j in (Current 15.0) DO @if exist "%_Py_MSBuild_Root%\%%j\Bin\msbuild.exe" (set MSBUILD="%_Py_MSBuild_Root%\%%j\Bin\msbuild.exe")
3838
@set _Py_MSBuild_Root=
3939
@if defined MSBUILD @if exist %MSBUILD% (set _Py_MSBuild_Source=Visual Studio installation) & goto :found
4040
:skip_vswhere
4141

42-
@rem VS 2017 sets exactly one install as the "main" install, so we may find MSBuild in there.
43-
@reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v 15.0 /reg:32 >nul 2>nul
44-
@if NOT ERRORLEVEL 1 @for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v 15.0 /reg:32') DO @(
45-
@if "%%i"=="15.0" @if exist "%%k\MSBuild\15.0\Bin\msbuild.exe" @(set MSBUILD="%%k\MSBuild\15.0\Bin\msbuild.exe")
46-
)
47-
@if exist %MSBUILD% (set _Py_MSBuild_Source=Visual Studio 2017 registry) & goto :found
48-
4942
@rem VS 2015 and earlier register MSBuild separately, so we can find it.
5043
@reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath /reg:32 >nul 2>nul
5144
@if NOT ERRORLEVEL 1 @for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath /reg:32') DO @(

‎PCbuild/pyproject.props‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,23 +201,41 @@ public override bool Execute() {
201201
</Target>
202202

203203

204-
<Target Name="FindVCRuntime" Returns="VCRuntimeDLL">
205-
<PropertyGroup Condition="$(PlatformToolset) != 'v140'">
206-
<VCRedistDir>$(VCInstallDir)\Redist\MSVC\$(VCToolsRedistVersion)\</VCRedistDir>
207-
<VCRedistDir Condition="$(Platform) == 'Win32'">$(VCRedistDir)x86\</VCRedistDir>
208-
<VCRedistDir Condition="$(Platform) != 'Win32'">$(VCRedistDir)$(Platform)\</VCRedistDir>
209-
</PropertyGroup>
204+
<Target Name="FindVCRedistDir">
205+
<!-- Hard coded path for VS 2015 -->
210206
<PropertyGroup Condition="$(PlatformToolset) == 'v140'">
211207
<VCRedistDir>$(VCInstallDir)\redist\</VCRedistDir>
208+
</PropertyGroup>
209+
210+
<!-- Search for version number in some broken Build Tools installs -->
211+
<ItemGroup Condition="$(VCRedistDir) == '' and $(VCToolsRedistVersion) == ''">
212+
<_RedistFiles Include="$(VCInstallDir)\Redist\MSVC\*\*.*" />
213+
</ItemGroup>
214+
<PropertyGroup Condition="$(VCRedistDir) == '' and $(VCToolsRedistVersion) == ''">
215+
<_RedistDir>%(_RedistFiles.Directory)</_RedistDir>
216+
<VCToolsRedistVersion>$([System.IO.Path]::GetFileName($(_RedistDir.Trim(`\`))))</VCToolsRedistVersion>
217+
</PropertyGroup>
218+
219+
<!-- Use correct path for VS 2017 and later -->
220+
<PropertyGroup Condition="$(VCRedistDir) == ''">
221+
<VCRedistDir>$(VCInstallDir)\Redist\MSVC\$(VCToolsRedistVersion)\</VCRedistDir>
222+
</PropertyGroup>
223+
224+
<PropertyGroup>
212225
<VCRedistDir Condition="$(Platform) == 'Win32'">$(VCRedistDir)x86\</VCRedistDir>
213226
<VCRedistDir Condition="$(Platform) != 'Win32'">$(VCRedistDir)$(Platform)\</VCRedistDir>
214227
</PropertyGroup>
215228

229+
<Message Text="VC Redist Directory: $(VCRedistDir)" />
230+
<Message Text="VC Redist Version: $(VCToolsRedistVersion)" />
231+
</Target>
232+
233+
<Target Name="FindVCRuntime" Returns="VCRuntimeDLL" DependsOnTargets="FindVCRedistDir">
216234
<ItemGroup Condition="$(VCInstallDir) != ''">
217235
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
218236
</ItemGroup>
219237

220-
<Warning Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" />
221-
<Message Text="VCRuntimeDLL: @(VCRuntimeDLL)" Importance="high" />
238+
<Warning Text="vcruntime*.dll not found under $(VCRedistDir)." Condition="@(VCRuntimeDLL) == ''" />
239+
<Message Text="VC Runtime DLL(s):%0A- @(VCRuntimeDLL,'%0A- ')" />
222240
</Target>
223241
</Project>

0 commit comments

Comments
 (0)