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 394856 465d150bc8be5bbf9f02a8607d4552b6a5e1697c
parent 394855 e0af0c1cf0976947da7934aed8d48ea2827e592c
child 394857 86f463d7a0f13e0cc3403f44c7bfe0df5d893969
child 394898 9d13e820b0e3e11002a7d0b4bbea1074b7b0b7c6
child 394911 08d9378a23262125efc3e6c0ed04cf724b08a8a4
child 394942 22dc92f747141efcaf3f926ad701a563d1ea5585
child 394965 c94403616cdd5e67861c73b87e7eaec63939c375
child 394968 abd896d255ddbf552cdabf5a829305e3497e5184
child 394969 f8bf93b1c8d547cc62ba405197152129b5736059
child 394972 9c11f73a4ddf11c893d97a70d786320d2adb989e
child 394992 32f95e3de52f976dbb37d5f7482da601d4adf30e
child 394994 1784778c52f0e26829d48517bc4b8aca5cedab55
child 395011 8230a27c66481062f3004b5039e86ce579563d59
child 395016 cbbc3f498e72706c672778357856096f31794f9f
child 395058 a99ddb08115c5b84863458ed114803faaa4f64dc
child 395316 4fc864e4e4dda4a9f6477a5788d1868b1a3ed5d8
child 395493 225593bf6eb2463624183f840ea821576c59468a
child 396117 d8788f07ed30ecd039e62a99eb3c741bed8edd4b
child 401166 2c558f1622ae36794288f9e28cbea72e5bc69ed9
child 414977 01dc83feb951f10698b5be056510f74cc737c2df
push id24653
push usermasayuki@d-toybox.com
push dateMon, 01 Aug 2016 07:51:13 +0000
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.