Don't patch glfw when importing since the patch has moved upstream

This commit is contained in:
Kovid Goyal 2018-09-04 09:46:09 +05:30
parent 0b6948cb4f
commit e630b76fac
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -128,16 +128,6 @@ def extract_sources(group, start_pos=0):
return ans
def patch_in_file(path, pfunc):
with open(path, 'r+') as f:
raw = f.read()
nraw = pfunc(raw)
if raw == nraw:
raise SystemExit('Patching of {} failed'.format(path))
f.seek(0), f.truncate()
f.write(nraw)
class Arg:
def __init__(self, decl):
@ -283,8 +273,6 @@ def from_glfw(glfw_dir):
for src in files_to_copy:
shutil.copy2(src, '.')
shutil.copy2(glfw_header, '.')
patch_in_file('cocoa_window.m', lambda x: re.sub(
r'[(]void[)]loadMainMenu.+?}', '(void)loadMainMenu\n{ // removed by Kovid as it generated compiler warnings \n}\n', x, flags=re.DOTALL))
json.dump(
sinfo,
open('source-info.json', 'w'),