Backed out changeset 0f6396641036 (bug 1289638) for breaking windows spidermonkey tests/builds

build/windows_toolchain.py

@@ -29,18 +29,23 @@ import mozpack.path as mozpath
 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/**',
         ),
@@ -155,6 +160,9 @@ def resolve_files():
         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: