Bug 1289638 - Don't remove the SDK version from the SDK paths in the MSVC tooltool package. r?gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 28 Jul 2016 16:53:44 +0900
changeset 393685 2b2a969e72e989b83e5641ecaf69e5cca3a9ef6d
parent 393684 f040e5b34bdf7e7ad34ce0308099dba2a2883a8b
child 393686 dacfb753aaa482e266e1b5587e92ff178ec18785
push id24377
push userbmo:mh+mozilla@glandium.org
push dateThu, 28 Jul 2016 08:01:16 +0000
reviewersgps
bugs1289638
milestone50.0a1
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.