diff options
| author | Steve Dower <steve.dower@python.org> | 2020-03-11 14:12:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 14:12:31 +0000 |
| commit | fde44ae6d08d3df79554155b1cf079e73a8fabdd (patch) | |
| tree | 7935808b688fb040b84802dc2217d5e96df16b88 | |
| parent | 3c97e1e457033bbb8bbe0b7198bd13fc794a12b0 (diff) | |
| download | cpython-git-fde44ae6d08d3df79554155b1cf079e73a8fabdd.tar.gz | |
bpo-39930: Convert error to warning for more silent failure (GH-18921)
Makes it an error to create a layout without vcruntime DLL
| -rw-r--r-- | PC/layout/main.py | 4 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/PC/layout/main.py b/PC/layout/main.py index 305cb517d0..3eef755629 100644 --- a/PC/layout/main.py +++ b/PC/layout/main.py @@ -173,8 +173,12 @@ def get_layout(ns): 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.build / "LICENSE.txt" diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 0bbdcfa1db..061c2253bc 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -217,7 +217,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> |