Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1290019 - Remove MT version check. r=chmanchester

Browse Source 
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.

--HG--
extra : rebase_source : 4887cebf0f56ca1a297cd02ff1988809c5cb6fdf
This commit is contained in:
Mike Hommey 2016-07-28 18:29:49 +09:00
parent 0ce2b1771e
commit 96c8b2dca4
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/moz.configure/windows.configure
View File

@ -185,7 +185,6 @@ mt = check_prog('_MT', depends_win()(lambda: ('mt.exe',)), what='mt',
# utility".
@depends_win(mt)
@checking('whether MT is really Microsoft Manifest Tool', lambda x: bool(x))
@imports('re')
@imports('subprocess')
def valid_mt(path):
try:
@ -193,21 +192,13 @@ def valid_mt(path):
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:
pass
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)))