Backed out changeset ada66cbedd75 (bug 1289638)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 01 Aug 2016 09:12:39 +0200
changeset 349607 e0af0c1cf0976947da7934aed8d48ea2827e592c
parent 349606 3d54c9412b984e4b4f1aaf4d0a204b2b8c978947
child 349608 465d150bc8be5bbf9f02a8607d4552b6a5e1697c
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)
bugs1289638
milestone50.0a1
backs outada66cbedd756998bf5d0e8648556c1e48c5e52b
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
Backed out changeset ada66cbedd75 (bug 1289638)
build/windows_toolchain.py
--- a/build/windows_toolchain.py
+++ b/build/windows_toolchain.py
@@ -156,16 +156,19 @@ def resolve_files():
             assert p.startswith(('VC/', 'DIA SDK/'))
 
             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.
+            p = p.replace('/%s/' % SDK_RELEASE, '/')
             relpath = 'SDK/%s' % p
 
             yield relpath.encode('utf-8'), f
 
 
 def resolve_files_and_hash(manifest):
     """Resolve files and hash their data.