From 79dd59ee79117ac10e278bdd5be2d57f8808edb6 Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Tue, 13 Jun 2017 12:54:54 -0700 Subject: [PATCH] Fix redist packaging for VS 2017 Update 3 Preview 2 The second preview of VS 2017 Update 3 removed the MFC DLLs from the redist directory. Luckily it appears that we don't actually need them. The directories were also renamed from VC150 to VC141. This change switches to VC* to make it more robust, enabled by the use of glob added a few changes ago. crrev.com/2938453003, which tests a package that was created with this updated script, passed. BUG=683729 R=scottmg@chromium.org Change-Id: I4ae5dec949d16a83e1751e3d2ff7bd10a78b680f Reviewed-on: https://chromium-review.googlesource.com/534353 Reviewed-by: Scott Graham Commit-Queue: Bruce Dawson --- win_toolchain/package_from_installed.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/win_toolchain/package_from_installed.py b/win_toolchain/package_from_installed.py index 9c4b72b48..8e1fd2fa8 100644 --- a/win_toolchain/package_from_installed.py +++ b/win_toolchain/package_from_installed.py @@ -111,18 +111,14 @@ def BuildFileList(override_dir): ] elif VS_VERSION == '2017': paths += [ - ('VC/redist/MSVC/14.*.*/x86/Microsoft.VC150.CRT', 'sys32'), - ('VC/redist/MSVC/14.*.*/x86/Microsoft.VC150.CRT', 'win_sdk/bin/x86'), - ('VC/redist/MSVC/14.*.*/x86/Microsoft.VC150.MFC', 'sys32'), - ('VC/redist/MSVC/14.*.*/debug_nonredist/x86/Microsoft.VC150.DebugCRT', 'sys32'), - ('VC/redist/MSVC/14.*.*/debug_nonredist/x86/Microsoft.VC150.DebugMFC', 'sys32'), - ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC150.CRT', 'sys64'), - ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC150.CRT', 'VC/bin/amd64_x86'), - ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC150.CRT', 'VC/bin/amd64'), - ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC150.CRT', 'win_sdk/bin/x64'), - ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC150.MFC', 'sys64'), - ('VC/redist/MSVC/14.*.*/debug_nonredist/x64/Microsoft.VC150.DebugCRT', 'sys64'), - ('VC/redist/MSVC/14.*.*/debug_nonredist/x64/Microsoft.VC150.DebugMFC', 'sys64'), + ('VC/redist/MSVC/14.*.*/x86/Microsoft.VC*.CRT', 'sys32'), + ('VC/redist/MSVC/14.*.*/x86/Microsoft.VC*.CRT', 'win_sdk/bin/x86'), + ('VC/redist/MSVC/14.*.*/debug_nonredist/x86/Microsoft.VC*.DebugCRT', 'sys32'), + ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC*.CRT', 'sys64'), + ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC*.CRT', 'VC/bin/amd64_x86'), + ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC*.CRT', 'VC/bin/amd64'), + ('VC/redist/MSVC/14.*.*/x64/Microsoft.VC*.CRT', 'win_sdk/bin/x64'), + ('VC/redist/MSVC/14.*.*/debug_nonredist/x64/Microsoft.VC*.DebugCRT', 'sys64'), ] else: raise ValueError('VS_VERSION %s' % VS_VERSION)