wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

patchutils.py: Invert logic for applying #ifdef patches.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-07-22 17:29:14 +02:00
parent c779a2acbe
commit 4b1b7f77bc
4 changed files with 5250 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
staging/patchutils.py
View File

@ -612,10 +612,10 @@ def generate_ifdef_patch(original, patched, ifdef):
intermediate.write("\n")
if len(srcdata) and len(dstdata):
intermediate.write("#if defined(%s)\n" % ifdef)
intermediate.write("\n".join(dstdata))
intermediate.write("\n#else /* %s */\n" % ifdef)
intermediate.write("#if !defined(%s)\n" % ifdef)
intermediate.write("\n".join(srcdata))
intermediate.write("\n#else /* %s */\n" % ifdef)
intermediate.write("\n".join(dstdata))
intermediate.write("\n#endif /* %s */\n" % ifdef)
elif len(srcdata):
@ -637,9 +637,9 @@ def generate_ifdef_patch(original, patched, ifdef):
intermediate.write("\n")
intermediate.flush()
# Now we can finally compute the diff between the patched file and our intermediate file
# Now we can finally compute the diff between the original file and our intermediate file
diff = tempfile.NamedTemporaryFile(mode='w+')
exitcode = subprocess.call(["git", "diff", "--no-index", patched.name, intermediate.name],
exitcode = subprocess.call(["git", "diff", "--no-index", original.name, intermediate.name],
stdout=diff, stderr=_devnull)
if exitcode != 1: # exitcode 0 cannot (=shouldn't) happen in this situation
raise PatchDiffError("Failed to compute diff (exitcode %d)." % exitcode)
@ -913,23 +913,7 @@ if __name__ == "__main__":
expected = ["@@ -1,9 +1,15 @@",
" line1();", " line2();", " line3();",
"+#if defined(PATCHED)",
" function(arg1, \\",
" new_arg2, \\",
" arg3);",
"+#else /* PATCHED */",
"+function(arg1, \\",
"+ arg2, \\",
"+ arg3);",
"+#endif /* PATCHED */",
" line5();", " line6();", " line7();"]
diff = generate_ifdef_patch(source1, source2, "PATCHED")
lines = diff.read().rstrip("\n").split("\n")
self.assertEqual(lines, expected)
expected = ["@@ -1,9 +1,15 @@",
" line1();", " line2();", " line3();",
"+#if defined(PATCHED)",
"+#if !defined(PATCHED)",
" function(arg1, \\",
" arg2, \\",
" arg3);",
@ -939,6 +923,22 @@ if __name__ == "__main__":
"+ arg3);",
"+#endif /* PATCHED */",
" line5();", " line6();", " line7();"]
diff = generate_ifdef_patch(source1, source2, "PATCHED")
lines = diff.read().rstrip("\n").split("\n")
self.assertEqual(lines, expected)
expected = ["@@ -1,9 +1,15 @@",
" line1();", " line2();", " line3();",
"+#if !defined(PATCHED)",
" function(arg1, \\",
" new_arg2, \\",
" arg3);",
"+#else /* PATCHED */",
"+function(arg1, \\",
"+ arg2, \\",
"+ arg3);",
"+#endif /* PATCHED */",
" line5();", " line6();", " line7();"]
diff = generate_ifdef_patch(source2, source1, "PATCHED")
lines = diff.read().rstrip("\n").split("\n")
self.assertEqual(lines, expected)