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

[Miss Islington (bot)]

https://github.com/python/cpython/commit/3136f6f287a56afe87c0fd3e70c15c6e53ae0814
commit: 3136f6f287a56afe87c0fd3e70c15c6e53ae0814
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-03-11T07:30:25-07:00
summary:

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 fde44ae6d08d3df79554155b1cf079e73a8fabdd)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M PC/layout/main.py
M PCbuild/pyproject.props

diff --git a/PC/layout/main.py b/PC/layout/main.py
index 910085c01bb2e..4d47b2e78f3f2 100644
--- a/PC/layout/main.py
+++ b/PC/layout/main.py
@@ -153,8 +153,12 @@ def in_build(f, dest="", new_name=None):
     if ns.include_stable:
         yield from in_build(PYTHON_STABLE_DLL_NAME)
 
+    found_any = False
     for dest, src in rglob(ns.build, "vcruntime*.dll"):
+        found_any = True
         yield dest, src
+    if not found_any:
+        log_error("Failed to locate vcruntime DLL in the build.")
 
     yield "LICENSE.txt", ns.source / "LICENSE"
 
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index f1eac3641cc60..d76dd74d8a80d 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -211,7 +211,7 @@ public override bool Execute() {
       <VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
     </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" />
   </Target>
 </Project>