Backed out changeset 0f6396641036 (bug 1289638) for breaking windows spidermonkey tests/builds FIREFOX_AURORA_50_BASE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 01 Aug 2016 09:12:55 +0200
changeset 307508 465d150bc8be5bbf9f02a8607d4552b6a5e1697c
parent 307507 e0af0c1cf0976947da7934aed8d48ea2827e592c
child 307509 1784778c52f0e26829d48517bc4b8aca5cedab55
child 307515 cbbc3f498e72706c672778357856096f31794f9f
child 307591 c94403616cdd5e67861c73b87e7eaec63939c375
child 307611 22dc92f747141efcaf3f926ad701a563d1ea5585
push idunknown
push userunknown
push dateunknown
bugs1289638
milestone50.0a1
backs out0f6396641036e51528865fd2a216482270c1ff35
Backed out changeset 0f6396641036 (bug 1289638) for breaking windows spidermonkey tests/builds
build/windows_toolchain.py
--- a/build/windows_toolchain.py
+++ b/build/windows_toolchain.py
@@ -24,28 +24,33 @@ 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/**',
     },
@@ -150,16 +155,19 @@ 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.