Bug 1289638 - Don't rename the DIA SDK directory in the MSVC tooltool package. r=gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 27 Jul 2016 09:32:22 +0900
changeset 393684 f040e5b34bdf7e7ad34ce0308099dba2a2883a8b
parent 393484 db3ed1fdbbeaf5ab1e8fe454780146e7499be3db
child 393685 2b2a969e72e989b83e5641ecaf69e5cca3a9ef6d
child 394066 bea719b33e9ccc7120c457aa3cf85642e0b8e460
push id24377
push userbmo:mh+mozilla@glandium.org
push dateThu, 28 Jul 2016 08:01:16 +0000
reviewersgps
bugs1289638
milestone50.0a1
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.