Bug 1289638 - Don't remove the SDK version from the SDK paths in the MSVC tooltool package. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 28 Jul 2016 16:53:44 +0900
changeset 348977 ad744de6990416b29314b9d339c018bef2164cef
parent 348976 d0e304a1d639d9d999ef5b997f3dde49748d88f5
child 348978 f0b5125375e62995f973b4c829d735136bdf21a9
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1289638
milestone51.0a1
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
Bug 1289638 - Don't remove the SDK version from the SDK paths in the MSVC tooltool package. r=gps While we're here changing the MSVC tooltool package, and since we're going to remove the INCLUDE and LIB lines from mozconfigs that contain the SDK version, we might as well make the SDK in the tooltool package closer to an actual SDK, so that automation and local build more or less follow the same (upcoming) configure code path.
build/windows_toolchain.py
--- a/build/windows_toolchain.py
+++ b/build/windows_toolchain.py
@@ -156,19 +156,16 @@ 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.