Bug 1289638 - Don't rename the DIA SDK directory in the MSVC tooltool package. r=gps
☠☠ backed out by 465d150bc8be ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 27 Jul 2016 09:32:22 +0900
changeset 349493 0f6396641036e51528865fd2a216482270c1ff35
parent 349492 4907812dbb41d1a4f88a5770c4410dce5f4a37cd
child 349494 ada66cbedd756998bf5d0e8648556c1e48c5e52b
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1289638
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289638 - Don't rename the DIA SDK directory in the MSVC tooltool package. r=gps
build/windows_toolchain.py
--- a/build/windows_toolchain.py
+++ b/build/windows_toolchain.py
@@ -24,33 +24,28 @@ from mozpack.mozjar import (
 )
 import mozpack.path as mozpath
 
 
 # mozpack.match patterns for files under "Microsoft Visual Studio 14.0".
 VS_PATTERNS = [
     {
         'pattern': 'DIA SDK/bin/**',
-        # Various tools don't like spaces in filenames. So remove it.
-        'rewrite': [('DIA SDK/', 'DIASDK/')],
         'ignore': (
             'DIA SDK/bin/arm/**',
         ),
     },
     {
         'pattern': 'DIA SDK/idl/**',
-        'rewrite': [('DIA SDK/', 'DIASDK/')],
     },
     {
         'pattern': 'DIA SDK/include/**',
-        'rewrite': [('DIA SDK/', 'DIASDK/')],
     },
     {
         'pattern': 'DIA SDK/lib/**',
-        'rewrite': [('DIA SDK/', 'DIASDK/')],
         'ignore': (
             'DIA SDK/lib/arm/**',
         ),
     },
     # ATL is needed by Breakpad.
     {
         'pattern': 'VC/atlmfc/include/**',
     },
@@ -155,19 +150,16 @@ def resolve_files():
     vs_path, sdk_path = find_vs_paths()
 
     for entry in VS_PATTERNS:
         finder = FileFinder(vs_path, find_executables=False,
                             ignore=entry.get('ignore', []))
         for p, f in finder.find(entry['pattern']):
             assert p.startswith(('VC/', 'DIA SDK/'))
 
-            for source, dest in entry.get('rewrite', []):
-                p = p.replace(source, dest)
-
             yield p.encode('utf-8'), f
 
     for entry in SDK_PATTERNS:
         finder = FileFinder(sdk_path, find_executables=False,
                             ignore=entry.get('ignore', []))
         for p, f in finder.find(entry['pattern']):
             # We remove the SDK version from the path so we don't have
             # to update other configs when we change the SDK version.