traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-39930: Convert error to warning for more silent failure (GH-18921) 

Makes it an error to create a layout without vcruntime DLL
(cherry picked from commit fde44ae6d0)

Co-authored-by: Steve Dower <steve.dower@python.org>
This commit is contained in:
Miss Islington (bot) 2020-03-11 07:31:07 -07:00 committed by GitHub
parent d01c5507e5
commit 17571c54e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PC/layout/main.py
View File

@ -173,8 +173,12 @@ def get_layout(ns):
if ns.include_stable: if ns.include_stable:
yield from in_build(PYTHON_STABLE_DLL_NAME) yield from in_build(PYTHON_STABLE_DLL_NAME)
found_any = False
for dest, src in rglob(ns.build, "vcruntime*.dll"): for dest, src in rglob(ns.build, "vcruntime*.dll"):
found_any = True
yield dest, src yield dest, src
if not found_any:
log_error("Failed to locate vcruntime DLL in the build.")
yield "LICENSE.txt", ns.build / "LICENSE.txt" yield "LICENSE.txt", ns.build / "LICENSE.txt"

2
PCbuild/pyproject.props
View File

@ -218,7 +218,7 @@ public override bool Execute() {
<VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" /> <VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
</ItemGroup> </ItemGroup>
<Error Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" /> <Warning Text="vcruntime14*.dll not found under $(VCInstallDir)" Condition="@(VCRuntimeDLL) == ''" />
<Message Text="VCRuntimeDLL: @(VCRuntimeDLL)" Importance="high" /> <Message Text="VCRuntimeDLL: @(VCRuntimeDLL)" Importance="high" />
</Target> </Target>
</Project> </Project>