Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1661739 - Adjust merge_dlldata to widl output. r=nalexander

Browse Source 
widl output for dlldata has #defines immediately followed by #includes,
so looking for empty lines when we observer a #define doesn't work. We
instead look for #defines.

Differential Revision: https://phabricator.services.mozilla.com/D88938
This commit is contained in:
Mike Hommey 2020-09-01 20:25:49 +00:00
parent 968f3b8fd6
commit 03aa21e4bf
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/midl.py
View File

@ -49,7 +49,7 @@ def merge_dlldata(out, *inputs):
inputs = [open(i) for i in inputs]
read_a_line = [True] * len(inputs)
while True:
lines = [f.readline() if read_a_line[n] else '\n' for n, f in enumerate(inputs)]
lines = [f.readline() if read_a_line[n] else lines[n] for n, f in enumerate(inputs)]
unique_lines = set(lines)
if len(unique_lines) == 1:
# All the lines are identical
@ -57,14 +57,21 @@ def merge_dlldata(out, *inputs):
break
out.write(lines[0])
read_a_line = [True] * len(inputs)
elif len(unique_lines) == 2 and '\n' in unique_lines:
# Most lines are identical, except for some that are empty.
# In this case, we print out the line, but on next iteration, don't read
# a new line from the inputs that had nothing. This typically happens when
# some files have #defines that others don't.
unique_lines.remove('\n')
out.write(unique_lines.pop())
read_a_line = [l != '\n' for l in lines]
elif len(unique_lines) == 2 and len([l for l in unique_lines if '#define' in l]) == 1:
# Most lines are identical. When they aren't, it's typically because some
# files have an extra #define that others don't. When that happens, we
# print out the #define, and get a new input line from the files that had
# a #define on the next iteration. We expect that next line to match what
# the other files had on this iteration.
# Note: we explicitly don't support the case where there are different
# defines across different files, except when there's a different one
# for each file, in which case it's handled further below.
a = unique_lines.pop()
if '#define' in a:
out.write(a)
else:
out.write(unique_lines.pop())
read_a_line = ['#define' in l for l in lines]
elif len(unique_lines) != len(lines):
# If for some reason, we don't get lines that are entirely different
# from each other, we have some unexpected input.