Bug 1290019 - Remove MT version check. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 28 Jul 2016 18:29:49 +0900
changeset 349160 b722fac1af4b88f9ed41f620b0eef2e851f04faa
parent 349159 10fccfc043b7390f5599499c0fff7d4aab3fb9fc
child 349161 135382fd463d87ddda4224a0c844b588753d5c30
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)
bugs1290019, 1289294
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 1290019 - Remove MT version check. r=chmanchester Before bug 1289294, the impossibility to find the version of MT was only issuing a warning. Warnings in configure are essentially useless, so since we weren't and still aren't doing anything with the result of that check, and since there are versions of MT that don't print out a version number, just remove the check.
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -180,39 +180,30 @@ def sdk_bin_path(valid_windows_sdk_dir):
 mt = check_prog('_MT', depends_win()(lambda: ('mt.exe',)), what='mt',
                 input='MT', paths=sdk_bin_path)
 # Check that MT is not something unexpected like "magnetic tape manipulation
 # utility".
 @checking('whether MT is really Microsoft Manifest Tool', lambda x: bool(x))
 def valid_mt(path):
         out = subprocess.check_output([path]).splitlines()
         out = '\n'.join(l for l in out
                         if 'Microsoft (R) Manifest Tool' in l)
         if out:
-              m = re.search(r'(?<=[^!-~])[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+',
-                            out)
-              if not m:
-                  raise FatalCheckError(
-                      'Unknown version of the Microsoft Manifest Tool')
-              return namespace(
-                  path=path,
-                  version=Version(m.group(0)),
-              )
+              return path
     except subprocess.CalledProcessError:
     raise FatalCheckError('%s is not Microsoft Manifest Tool')
-set_config('MT', depends_if(valid_mt)(lambda x: os.path.basename(x.path)))
+set_config('MT', depends_if(valid_mt)(lambda x: os.path.basename(x)))
 set_config('MSMANIFEST_TOOL', depends(valid_mt)(lambda x: bool(x)))
 # Normally, we'd just have CC, etc. set to absolute paths, but the build system
 # doesn't currently handle properly the case where the paths contain spaces.
 # Additionally, there's the issue described in toolchain.configure, in
 # valid_compiler().