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 <scottmg@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
changes/53/534353/2
Bruce Dawson 8 years ago committed by Commit Bot
parent 21d6ec4814
commit 79dd59ee79

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

Loading…
Cancel
Save