166810 2017-01-07 12:50:18 -0800 Avoid triggering rebuilds for minor changes of CSSProperties.json 2017-01-16 11:02:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED P2 Normal --- 166842 1 simon.fraser simon.fraser ap commit-queue darin dbates simon.fraser oldest_to_newest 1264721 0 simon.fraser 2017-01-07 12:50:18 -0800 Avoid triggering rebulids for minor changes of CSSProperties.json 1264722 1 298281 simon.fraser 2017-01-07 12:51:51 -0800 Created attachment 298281 Patch 1264726 2 298281 dbates 2017-01-07 13:06:41 -0800 Comment on attachment 298281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298281&action=review r=me > Source/WebCore/css/makeprop.pl:184 > + if (compare($tempFile, $file) != 0) { I take it you feel the "!= 0" improves the readability of this code. 1264765 3 298281 commit-queue 2017-01-07 15:40:32 -0800 Comment on attachment 298281 Patch Clearing flags on attachment: 298281 Committed r210493: <http://trac.webkit.org/changeset/210493> 1264766 4 commit-queue 2017-01-07 15:40:36 -0800 All reviewed patches have been landed. Closing bug. 1264785 5 298281 darin 2017-01-07 17:09:18 -0800 Comment on attachment 298281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298281&action=review Here’s a problem that will slow down builds that I think we have after this patch: Lets say we edit CSSProperties.json so that it is newer than CSSPropertyNames.h, but our edit does not affect the contents of CSSPropertyNames.h. We build and the new version of this script will correctly leave CSSPropertyNames.h unmodified. Now we build again without editing CSSProperties.json. Unfortunately, the make file sees that CSSPropertyNames.h is older than CSSProperties.json so it runs makeprop.pl again. That means we are now going to run makeprop.pl every time we build WebKit, once this happens. I don’t know how to make correct rules in a makefile for case like this; but I am pretty sure the problem is real. I would love to find a good solution for the problem that we can use in this case and that we can use in other similar cases. > Source/WebCore/css/makeprop.pl:185 > + copy($tempFile, $file) or die "Failed to copy $tempFile to $file: $!"; This should be a move, rather than a copy followed by an unlink. > Source/WebCore/css/makeprop.pl:192 > +open GPERF, ">$gperfTempFile" || die "Could not open $gperfTempFile for writing"; These problems both existed before this patch: It’s cleaner to write: open GPERF, ">", $gperfTempFile or die ... Including the ">" in the filename was needed in old versions of perl, but in new ones we don’t need to do that. I also suspect that "|| die" is wrong and this needs to use "or die" because of operator precedence. I’m pretty sure that the "||" will be part of evaluating the argument to open, not something evaluated based on the return value of open. This same thing applies to code below. > Source/WebCore/css/makeprop.pl:351 > +my $properyNamesHeaderTempFile = "CSSPropertyNames.h.tmp"; There’s a typo in this variable name and all the uses of it, "propery" without the "t". 1264788 6 simon.fraser 2017-01-07 17:39:26 -0800 (In reply to comment #5) > Comment on attachment 298281 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=298281&action=review > > Here’s a problem that will slow down builds that I think we have after this > patch: > > Lets say we edit CSSProperties.json so that it is newer than > CSSPropertyNames.h, but our edit does not affect the contents of > CSSPropertyNames.h. We build and the new version of this script will > correctly leave CSSPropertyNames.h unmodified. Now we build again without > editing CSSProperties.json. Unfortunately, the make file sees that > CSSPropertyNames.h is older than CSSProperties.json so it runs makeprop.pl > again. > > That means we are now going to run makeprop.pl every time we build WebKit, > once this happens. True. Maybe the fix is to keep the intermediate files around and involve them in make dependencies, or use timestamp files. > I don’t know how to make correct rules in a makefile for case like this; but > I am pretty sure the problem is real. I would love to find a good solution > for the problem that we can use in this case and that we can use in other > similar cases. > > > Source/WebCore/css/makeprop.pl:185 > > + copy($tempFile, $file) or die "Failed to copy $tempFile to $file: $!"; > > This should be a move, rather than a copy followed by an unlink. > > > Source/WebCore/css/makeprop.pl:192 > > +open GPERF, ">$gperfTempFile" || die "Could not open $gperfTempFile for writing"; > > These problems both existed before this patch: > > It’s cleaner to write: > > open GPERF, ">", $gperfTempFile or die ... > > Including the ">" in the filename was needed in old versions of perl, but in > new ones we don’t need to do that. > > I also suspect that "|| die" is wrong and this needs to use "or die" because > of operator precedence. I’m pretty sure that the "||" will be part of > evaluating the argument to open, not something evaluated based on the return > value of open. > > This same thing applies to code below. > > > Source/WebCore/css/makeprop.pl:351 > > +my $properyNamesHeaderTempFile = "CSSPropertyNames.h.tmp"; > > There’s a typo in this variable name and all the uses of it, "propery" > without the "t". I'll clean those up. 1264789 7 simon.fraser 2017-01-07 17:51:45 -0800 There's a hack involving md5 checksum files described here: https://www.cmcrossroads.com/article/rebuilding-when-files-checksum-changes 1264790 8 simon.fraser 2017-01-07 17:53:24 -0800 Almost identical hack at http://blog.jgc.org/2006/04/rebuilding-when-hash-has-changed-not.html 1264804 9 simon.fraser 2017-01-07 21:59:10 -0800 A side effect of always running makeprops.pl is that CSSPropertyNames.cpp is regenerated each time. I think this step needs to be moved into the Makefile. 1264892 10 darin 2017-01-08 21:12:53 -0800 I’m really concerned about leaving this patch in. It’s nice to make the single build after modifying CSSProperties.json faster, but doing it this way makes all the builds from then on slower; we should turn this behavior off or roll it out until we solve the problem. 1264899 11 simon.fraser 2017-01-08 22:21:24 -0800 I'll roll it out. 1264990 12 commit-queue 2017-01-09 08:27:58 -0800 Re-opened since this is blocked by bug 166842 1267184 13 298974 simon.fraser 2017-01-16 11:02:22 -0800 Created attachment 298974 Non-working patch 298281 2017-01-07 12:51:51 -0800 2017-01-07 15:40:32 -0800 Patch bug-166810-20170107125019.patch text/plain 4736 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTRiMjE3YTAzMmNlYmJi MTJmMGNkYTg5YmNhMmI4M2JlNzI0NjQ2YS4uYmU2NWMzMDdkODliZDk3MTBlNjhiYzkyZDAwOTMx MDBlMWY0ZDYyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAxLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIHRyaWdn ZXJpbmcgcmVidWlsZHMgZm9yIG1pbm9yIGNoYW5nZXMgb2YgQ1NTUHJvcGVydGllcy5qc29uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjY4MTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBleHBlY3Qg dG8gbWFrZSBsb3RzIG9mIG1ldGFkYXRhLXJlbGF0ZWQgY2hhbmdlcyB0byBDU1NQcm9wZXJ0aWVz Lmpzb24sIGFuZAorICAgICAgICB0aGVzZSBzaG91bGQgbm90IHRyaWdnZXIgcmVidWlsZHMuCisg ICAgICAgIAorICAgICAgICBIYXZlIG1ha2Vwcm9wLnBsIHdyaXRlIHRvIHRlbXBvcmFyeSBmaWxl cyBmaXJzdCwgdGhlbiBvbmx5IHJlcGxhY2UgdGhlIGdlbmVyYXRlZAorICAgICAgICBmaWxlcyBp ZiB0aGUgY29udGVudHMgZGlmZmVyLgorCisgICAgICAgICogY3NzL21ha2Vwcm9wLnBsOgorICAg ICAgICAocmVwbGFjZUZpbGVJZkNoYW5nZWQpOgorCiAyMDE3LTAxLTA1ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW0Zvcm0gVmFsaWRhdGlvbl0gbGVuZ3RoeSB2 YWxpZGF0aW9uIG1lc3NhZ2VzIHNob3VsZCBiZSB0cnVuY2F0ZWQgd2l0aCBhbiBlbGxpcHNpcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsIGIvU291cmNlL1dlYkNv cmUvY3NzL21ha2Vwcm9wLnBsCmluZGV4IDg1MTk4NTU1N2MzMzM4NWM2ODM0MTQzOWRhZjRlNTY2 OWMzM2M3N2YuLmM1NThmMTFkZmIyNDg3MGE4ZDM4YWE3ODBlNGY3NThlNjE5MDY3NDkgMTAwNzU1 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvbWFrZXByb3AucGwKQEAgLTI3LDYgKzI3LDggQEAgdXNlIHN0cmljdDsKIHVzZSB3YXJu aW5nczsKIAogdXNlIEVuZ2xpc2g7Cit1c2UgRmlsZTo6Q29tcGFyZTsKK3VzZSBGaWxlOjpDb3B5 OwogdXNlIEZpbGU6OlNwZWM7CiB1c2UgR2V0b3B0OjpMb25nOwogdXNlIEpTT046OlBQOwpAQCAt MTc1LDcgKzE3NywxOSBAQCBzdWIgc29ydEJ5RGVzY2VuZGluZ1ByaW9yaXR5QW5kTmFtZQogCiBA bmFtZXMgPSBzb3J0IHNvcnRCeURlc2NlbmRpbmdQcmlvcml0eUFuZE5hbWUgQG5hbWVzOwogCi1v cGVuIEdQRVJGLCAiPkNTU1Byb3BlcnR5TmFtZXMuZ3BlcmYiIHx8IGRpZSAiQ291bGQgbm90IG9w ZW4gQ1NTUHJvcGVydHlOYW1lcy5ncGVyZiBmb3Igd3JpdGluZyI7CitzdWIgcmVwbGFjZUZpbGVJ ZkNoYW5nZWQoJCQpCit7CisgICAgbXkgKCR0ZW1wRmlsZSwgJGZpbGUpID0gQF87CisgICAgCisg ICAgaWYgKGNvbXBhcmUoJHRlbXBGaWxlLCAkZmlsZSkgIT0gMCkgeworICAgICAgICBjb3B5KCR0 ZW1wRmlsZSwgJGZpbGUpIG9yIGRpZSAiRmFpbGVkIHRvIGNvcHkgJHRlbXBGaWxlIHRvICRmaWxl OiAkISI7CisgICAgfQorICAgIHVubGluaygkdGVtcEZpbGUpOworfQorCitteSAkZ3BlcmZUZW1w RmlsZSA9ICJDU1NQcm9wZXJ0eU5hbWVzLmdwZXJmLnRtcCI7CisKK29wZW4gR1BFUkYsICI+JGdw ZXJmVGVtcEZpbGUiIHx8IGRpZSAiQ291bGQgbm90IG9wZW4gJGdwZXJmVGVtcEZpbGUgZm9yIHdy aXRpbmciOwogcHJpbnQgR1BFUkYgPDwgIkVPRiI7CiAlewogLyogVGhpcyBmaWxlIGlzIGF1dG9t YXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gJGlucHV0RmlsZSBieSBtYWtlcHJvcCwgZG8gbm90IGVk aXQgKi8KQEAgLTMzMiw3ICszNDYsMTEgQEAgRU9GCiAKIGNsb3NlIEdQRVJGOwogCi1vcGVuIEhF QURFUiwgIj5DU1NQcm9wZXJ0eU5hbWVzLmgiIHx8IGRpZSAiQ291bGQgbm90IG9wZW4gQ1NTUHJv cGVydHlOYW1lcy5oIGZvciB3cml0aW5nIjsKK3JlcGxhY2VGaWxlSWZDaGFuZ2VkKCRncGVyZlRl bXBGaWxlLCAiQ1NTUHJvcGVydHlOYW1lcy5ncGVyZiIpOworCitteSAkcHJvcGVyeU5hbWVzSGVh ZGVyVGVtcEZpbGUgPSAiQ1NTUHJvcGVydHlOYW1lcy5oLnRtcCI7CisKK29wZW4gSEVBREVSLCAi PiRwcm9wZXJ5TmFtZXNIZWFkZXJUZW1wRmlsZSIgfHwgZGllICJDb3VsZCBub3Qgb3BlbiAkcHJv cGVyeU5hbWVzSGVhZGVyVGVtcEZpbGUgZm9yIHdyaXRpbmciOwogcHJpbnQgSEVBREVSIDw8ICJF T0YiOwogLyogVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gJGlucHV0 RmlsZSBieSBtYWtlcHJvcCwgZG8gbm90IGVkaXQgKi8KIApAQCAtNDA1LDYgKzQyMyw4IEBAIEVP RgogCiBjbG9zZSBIRUFERVI7CiAKK3JlcGxhY2VGaWxlSWZDaGFuZ2VkKCRwcm9wZXJ5TmFtZXNI ZWFkZXJUZW1wRmlsZSwgIkNTU1Byb3BlcnR5TmFtZXMuaCIpOworCiAjCiAjIFN0eWxlQnVpbGRl ci5jcHAgZ2VuZXJhdG9yLgogIwpAQCAtODk0LDcgKzkxNCw5IEBAIHN1YiBnZW5lcmF0ZVZhbHVl U2V0dGVyIHsKICAgcmV0dXJuICRzZXR0ZXJDb250ZW50OwogfQogCi1vcGVuIFNUWUxFQlVJTERF UiwgIj5TdHlsZUJ1aWxkZXIuY3BwIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuIFN0eWxlQnVpbGRl ci5jcHAgZm9yIHdyaXRpbmciOworbXkgJHN0eWxlQnVpbGRlclRlbXBGaWxlID0gIlN0eWxlQnVp bGRlci5jcHAudG1wIjsKKworb3BlbiBTVFlMRUJVSUxERVIsICI+JHN0eWxlQnVpbGRlclRlbXBG aWxlIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuICRzdHlsZUJ1aWxkZXJUZW1wRmlsZSBmb3Igd3Jp dGluZyI7CiBwcmludCBTVFlMRUJVSUxERVIgPDwgIkVPRiI7CiAvKiBUaGlzIGZpbGUgaXMgYXV0 b21hdGljYWxseSBnZW5lcmF0ZWQgZnJvbSAkaW5wdXRGaWxlIGJ5IG1ha2Vwcm9wLCBkbyBub3Qg ZWRpdCAqLwogCkBAIC05NjgsOCArOTkwLDEzIEBAIEVPRgogCiBjbG9zZSBTVFlMRUJVSUxERVI7 CiAKK3JlcGxhY2VGaWxlSWZDaGFuZ2VkKCRzdHlsZUJ1aWxkZXJUZW1wRmlsZSwgIlN0eWxlQnVp bGRlci5jcHAiKTsKKwogIyBHZW5lcmF0ZSBTdHlsZVByb3BlcnR5U2hvcnRoYW5kc0Z1bmN0aW9u cy4KLW9wZW4gU0hPUlRIQU5EU19ILCAiPlN0eWxlUHJvcGVydHlTaG9ydGhhbmRGdW5jdGlvbnMu aCIgfHwgZGllICJDb3VsZCBub3Qgb3BlbiBTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25z LmggZm9yIHdyaXRpbmciOworCitteSAkc3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9uc0hl YWRlclRlbXBGaWxlID0gIlN0eWxlUHJvcGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuaC50bXAiOwor CitvcGVuIFNIT1JUSEFORFNfSCwgIj4kc3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9uc0hl YWRlclRlbXBGaWxlIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuICRzdHlsZVByb3BlcnR5U2hvcnRo YW5kRnVuY3Rpb25zSGVhZGVyVGVtcEZpbGUgZm9yIHdyaXRpbmciOwogcHJpbnQgU0hPUlRIQU5E U19IIDw8ICJFT0YiOwogLyogVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZy b20gJGlucHV0RmlsZSBieSBtYWtlcHJvcCwgZG8gbm90IGVkaXQgKi8KIApAQCAtOTk1LDcgKzEw MjIsMTMgQEAgRU9GCiAKIGNsb3NlIFNIT1JUSEFORFNfSDsKIAotb3BlbiBTSE9SVEhBTkRTX0NQ UCwgIj5TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNwcCIgfHwgZGllICJDb3VsZCBu b3Qgb3BlbiBTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNwcCBmb3Igd3JpdGluZyI7 CityZXBsYWNlRmlsZUlmQ2hhbmdlZCgkc3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9uc0hl YWRlclRlbXBGaWxlLCAiU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5oIik7CisKKyMg R2VuZXJhdGUgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZHNGdW5jdGlvbnMuCisKK215ICRzdHlsZVBy b3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zVGVtcEZpbGUgPSAiU3R5bGVQcm9wZXJ0eVNob3J0aGFu ZEZ1bmN0aW9ucy5jcHAudG1wIjsKKworb3BlbiBTSE9SVEhBTkRTX0NQUCwgIj4kc3R5bGVQcm9w ZXJ0eVNob3J0aGFuZEZ1bmN0aW9uc1RlbXBGaWxlIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuICRz dHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zVGVtcEZpbGUgZm9yIHdyaXRpbmciOwogcHJp bnQgU0hPUlRIQU5EU19DUFAgPDwgIkVPRiI7CiAvKiBUaGlzIGZpbGUgaXMgYXV0b21hdGljYWxs eSBnZW5lcmF0ZWQgZnJvbSAkaW5wdXRGaWxlIGJ5IG1ha2Vwcm9wLCBkbyBub3QgZWRpdCAqLwog CkBAIC0xMTA4LDYgKzExNDEsOCBAQCBFT0YKIAogY2xvc2UgU0hPUlRIQU5EU19DUFA7CiAKK3Jl cGxhY2VGaWxlSWZDaGFuZ2VkKCRzdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zVGVtcEZp bGUsICJTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNwcCIpOworCiBpZiAobm90ICRn cGVyZikgewogICAgICRncGVyZiA9ICRFTlZ7R1BFUkZ9ID8gJEVOVntHUEVSRn0gOiAiZ3BlcmYi OwogfQo= 298974 2017-01-16 11:02:22 -0800 2017-01-16 11:02:22 -0800 Non-working patch bug-166810-20170116110036.patch text/plain 8296 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNiYzYyYTVmNThiMDhh N2I5ZjUyZjFmOGZiZTU3ZTc1N2VlODEyNy4uZTZjYTY5ZmRkNmMyYTY4ZjZmNDk4NDgwOGMzNzM1 NmFjOWY0MWMyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE3LTAxLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEF2b2lkIHRyaWdn ZXJpbmcgcmVidWlsZHMgZm9yIG1pbm9yIGNoYW5nZXMgb2YgQ1NTUHJvcGVydGllcy5qc29uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjY4MTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVz dHMgKE9PUFMhKS4KKworICAgICAgICAqIERlcml2ZWRTb3VyY2VzLm1ha2U6CisgICAgICAgICog Y3NzL21ha2UtY3NzLXByb3BlcnR5LW5hbWVzLnBsOiBBZGRlZC4KKyAgICAgICAgKiBjc3MvbWFr ZXByb3AucGw6CisKKzIwMTctMDEtMTYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKICAgICAgICAgUmVtb3ZlIENTU1Byb3BlcnR5TmFtZXMuaW4gZnJvbSB0aGUgcHJv amVjdC4gSXQncyBub3QgdXNlZCBhbnkgbW9yZSwKICAgICAgICAgbm93IHRoYXQgd2UgZ2VuZXJh dGUgZmlsZXMgZnJvbSBDU1NQcm9wZXJ0aWVzLmpzb24uCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNl cy5tYWtlCmluZGV4IDkzYzdmNDA0ODZiNTRhMmViZWY3MjYxZjcwYjIwODdiNjIxZGFlN2MuLjJk Y2ZhN2ViM2ZkYzg0YjdmYmY2YjNkNjU5N2JhY2UxZTdlYzRlOGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvRGVyaXZl ZFNvdXJjZXMubWFrZQpAQCAtOTQ4LDE3ICs5NDgsNDUgQEAgZW5kaWYKIAogIyBDU1MgcHJvcGVy dHkgbmFtZXMgYW5kIHZhbHVlIGtleXdvcmRzCiAKLVdFQkNPUkVfQ1NTX1BST1BFUlRZX05BTUVT IDo9ICQoV2ViQ29yZSkvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgorV0VCQ09SRV9DU1NfUFJPUEVS VFlfTkFNRVNfSlNPTiA6PSAkKFdlYkNvcmUpL2Nzcy9DU1NQcm9wZXJ0aWVzLmpzb24KIFdFQkNP UkVfQ1NTX1ZBTFVFX0tFWVdPUkRTIDo9ICQoV2ViQ29yZSkvY3NzL0NTU1ZhbHVlS2V5d29yZHMu aW4KIFdFQkNPUkVfQ1NTX1ZBTFVFX0tFWVdPUkRTIDo9ICQoV0VCQ09SRV9DU1NfVkFMVUVfS0VZ V09SRFMpICQoV2ViQ29yZSkvY3NzL1NWR0NTU1ZhbHVlS2V5d29yZHMuaW4KIFdFQkNPUkVfQ1NT X1ZBTFVFX0tFWVdPUkRTX0RFRklORVMgOj0gJChGRUFUVVJFX0RFRklORVMpICQoQURESVRJT05B TF9DU1NfVkFMVUVfS0VZV09SRFNfREVGSU5FUykKIFdFQkNPUkVfQ1NTX1BST1BFUlRJRVNfREVG SU5FUyA6PSAkKEZFQVRVUkVfREVGSU5FUykgJChBRERJVElPTkFMX0NTU19QUk9QRVJUSUVTX0RF RklORVMpCiAKK3RvLW1kNSA9ICQocGF0c3Vic3QgJSwlLm1kNSwkMSkKK2Zyb20tbWQ1ID0gJChw YXRzdWJzdCAlLm1kNSwlLCQxKQorCiBhbGwgOiBDU1NQcm9wZXJ0eU5hbWVzLmggQ1NTUHJvcGVy dHlOYW1lcy5jcHAgU3R5bGVCdWlsZGVyLmNwcCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rp b25zLmggU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5jcHAKLUNTU1Byb3BlcnR5TmFt ZXMlaCBDU1NQcm9wZXJ0eU5hbWVzJWNwcCBTdHlsZUJ1aWxkZXIlY3BwIFN0eWxlUHJvcGVydHlT aG9ydGhhbmRGdW5jdGlvbnMlaCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zJWNwcCA6 ICQoV0VCQ09SRV9DU1NfUFJPUEVSVFlfTkFNRVMpIGNzcy9tYWtlcHJvcC5wbCAkKFBMQVRGT1JN X0ZFQVRVUkVfREVGSU5FUykKLQkkKFBFUkwpIC1wZSAnJyAkKFdFQkNPUkVfQ1NTX1BST1BFUlRZ X05BTUVTKSA+IENTU1Byb3BlcnRpZXMuanNvbgorCitDU1NQcm9wZXJ0eU5hbWVzJWguaW50IENT U1Byb3BlcnR5TmFtZXMlZ3BlcmYuaW50IFN0eWxlQnVpbGRlciVjcHAuaW50IFN0eWxlUHJvcGVy dHlTaG9ydGhhbmRGdW5jdGlvbnMlaC5pbnQgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9u cyVjcHAuaW50IDogJChXRUJDT1JFX0NTU19QUk9QRVJUWV9OQU1FU19KU09OKSBjc3MvbWFrZXBy b3AucGwgJChQTEFURk9STV9GRUFUVVJFX0RFRklORVMpCisJJChQRVJMKSAtcGUgJycgJChXRUJD T1JFX0NTU19QUk9QRVJUWV9OQU1FU19KU09OKSA+IENTU1Byb3BlcnRpZXMuanNvbgogCSQoUEVS TCkgIiQoV2ViQ29yZSkvY3NzL21ha2Vwcm9wLnBsIiAtLWRlZmluZXMgIiQoV0VCQ09SRV9DU1Nf UFJPUEVSVElFU19ERUZJTkVTKSIKIAorQ1NTUHJvcGVydHlOYW1lcy5oOiAkKGNhbGwgdG8tbWQ1 LENTU1Byb3BlcnR5TmFtZXMuaC5pbnQpCisJY3AgLWYgQ1NTUHJvcGVydHlOYW1lcy5oLmludCBD U1NQcm9wZXJ0eU5hbWVzLmgKKworQ1NTUHJvcGVydHlOYW1lcy5ncGVyZjogJChjYWxsIHRvLW1k NSxDU1NQcm9wZXJ0eU5hbWVzLmdwZXJmLmludCkKKwljcCAtZiBDU1NQcm9wZXJ0eU5hbWVzLmdw ZXJmLmludCBDU1NQcm9wZXJ0eU5hbWVzLmdwZXJmCisKK1N0eWxlQnVpbGRlci5jcHA6ICQoY2Fs bCB0by1tZDUsU3R5bGVCdWlsZGVyLmNwcC5pbnQpCisJY3AgLWYgU3R5bGVCdWlsZGVyLmNwcC5p bnQgU3R5bGVCdWlsZGVyLmNwcAorCitTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmg6 ICQoY2FsbCB0by1tZDUsU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5oLmludCkKKwlj cCAtZiBTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmguaW50IFN0eWxlUHJvcGVydHlT aG9ydGhhbmRGdW5jdGlvbnMuaAorCitTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNw cDogJChjYWxsIHRvLW1kNSxTdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNwcC5pbnQp CisJY3AgLWYgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5jcHAuaW50IFN0eWxlUHJv cGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuY3BwCisKK0NTU1Byb3BlcnR5TmFtZXMuY3BwIDogQ1NT UHJvcGVydHlOYW1lcy5ncGVyZiBjc3MvbWFrZS1jc3MtcHJvcGVydHktbmFtZXMucGwKKwkkKFBF UkwpICIkKFdlYkNvcmUpL2Nzcy9tYWtlLWNzcy1wcm9wZXJ0eS1uYW1lcy5wbCIgZ3BlcmYgQ1NT UHJvcGVydHlOYW1lcy5ncGVyZgorCislLm1kNTogRk9SQ0UKKwlAJChpZiAkKGZpbHRlci1vdXQg JChzaGVsbCBjYXQgJEAgMj4vZGV2L251bGwpLCQoc2hlbGwgbWQ1IC1yICQqKSksbWQ1IC1yICQq ID4gJEApCisKK0ZPUkNFOgorCisKIGFsbCA6IENTU1ZhbHVlS2V5d29yZHMuaCBDU1NWYWx1ZUtl eXdvcmRzLmNwcAogQ1NTVmFsdWVLZXl3b3JkcyVoIENTU1ZhbHVlS2V5d29yZHMlY3BwIDogJChX RUJDT1JFX0NTU19WQUxVRV9LRVlXT1JEUykgY3NzL21ha2V2YWx1ZXMucGwgYmluZGluZ3Mvc2Ny aXB0cy9wcmVwcm9jZXNzb3IucG0gJChQTEFURk9STV9GRUFUVVJFX0RFRklORVMpCiAJJChQRVJM KSAtcGUgJycgJChXRUJDT1JFX0NTU19WQUxVRV9LRVlXT1JEUykgPiBDU1NWYWx1ZUtleXdvcmRz LmluCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZS1jc3MtcHJvcGVydHktbmFt ZXMucGwgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZS1jc3MtcHJvcGVydHktbmFtZXMucGwKbmV3 IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uM2Y1ODJkNTM4OTNkNTQxODJjOTgxNmZkMDFjNDYyZTY0MzA0YzhmNgotLS0gL2Rl di9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlLWNzcy1wcm9wZXJ0eS1uYW1lcy5w bApAQCAtMCwwICsxLDM5IEBACisjISAvdXNyL2Jpbi9wZXJsCisjCisjICAgVGhpcyBmaWxlIGlz IHBhcnQgb2YgdGhlIFdlYktpdCBwcm9qZWN0CisjCisjICAgQ29weXJpZ2h0IChDKSAxOTk5IFdh bGRvIEJhc3RpYW4gKGJhc3RpYW5Aa2RlLm9yZykKKyMgICBDb3B5cmlnaHQgKEMpIDIwMDctMjAx NyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjICAgQ29weXJpZ2h0IChDKSAyMDA4 IE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQorIyAgIENvcHly aWdodCAoQykgMjAxMCBBbmRyYXMgQmVjc2kgKGFiZWNzaUBpbmYudS1zemVnZWQuaHUpLCBVbml2 ZXJzaXR5IG9mIFN6ZWdlZAorIyAgIENvcHlyaWdodCAoQykgMjAxMyBHb29nbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorIworIyAgIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRl cm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworIyAgIExpY2Vuc2UgYXMgcHVi bGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorIyAgIHZlcnNp b24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lv bi4KKyMKKyMgICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBp dCB3aWxsIGJlIHVzZWZ1bCwKKyMgICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQg ZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorIyAgIE1FUkNIQU5UQUJJTElUWSBvciBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjICAgTGlicmFyeSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisjCisjICAgWW91IHNob3Vs ZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMg TGljZW5zZQorIyAgIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlO Ry5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisjICAgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlv biwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKKyMgICBCb3N0b24sIE1B IDAyMTEwLTEzMDEsIFVTQS4KKwordXNlIHN0cmljdDsKK3VzZSBHZXRvcHQ6Okxvbmc7CisKK215 ICRpbnB1dEZpbGUgPSAiQ1NTUHJvcGVydHlOYW1lcy5ncGVyZiI7CitteSAkb3V0cHV0RmlsZSA9 ICJDU1NQcm9wZXJ0eU5hbWVzLmNwcCI7CisKK215ICRncGVyZjsKK0dldE9wdGlvbnMoJ2dwZXJm LWV4ZWN1dGFibGU9cycgPT4gXCRncGVyZik7CisKK2lmIChub3QgJGdwZXJmKSB7CisgICAgJGdw ZXJmID0gJEVOVntHUEVSRn0gPyAkRU5We0dQRVJGfSA6ICJncGVyZiI7Cit9CisKK3N5c3RlbSgi XCIkZ3BlcmZcIiAtLWtleS1wb3NpdGlvbnM9XCIqXCIgLUQgLW4gLXMgMiAkaW5wdXRGaWxlIC0t b3V0cHV0LWZpbGU9JG91dHB1dEZpbGUiKSA9PSAwIHx8IGRpZSAiY2FsbGluZyBncGVyZiBmYWls ZWQ6ICQ/IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAppbmRleCBlNjE3YzM4ZTc5ZjIzNTFmY2E4N2E4 YmRiMjY0MTA0MDcxM2JhZjM3Li5jZmI3MjAyNWMyY2E1OWExNjBiMWU5N2UyMWY1ZWQwNDNjZDMx MjNhIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCkBAIC0xNzUsNyArMTc1LDcgQEAgc3ViIHNvcnRC eURlc2NlbmRpbmdQcmlvcml0eUFuZE5hbWUKIAogQG5hbWVzID0gc29ydCBzb3J0QnlEZXNjZW5k aW5nUHJpb3JpdHlBbmROYW1lIEBuYW1lczsKIAotb3BlbiBHUEVSRiwgIj5DU1NQcm9wZXJ0eU5h bWVzLmdwZXJmIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuIENTU1Byb3BlcnR5TmFtZXMuZ3BlcmYg Zm9yIHdyaXRpbmciOworb3BlbiBHUEVSRiwgIj5DU1NQcm9wZXJ0eU5hbWVzLmdwZXJmLmludCIg b3IgZGllICJDb3VsZCBub3Qgb3BlbiBDU1NQcm9wZXJ0eU5hbWVzLmdwZXJmLmludCBmb3Igd3Jp dGluZyI7CiBwcmludCBHUEVSRiA8PCAiRU9GIjsKICV7CiAvKiBUaGlzIGZpbGUgaXMgYXV0b21h dGljYWxseSBnZW5lcmF0ZWQgZnJvbSAkaW5wdXRGaWxlIGJ5IG1ha2Vwcm9wLCBkbyBub3QgZWRp dCAqLwpAQCAtMzMyLDcgKzMzMiw3IEBAIEVPRgogCiBjbG9zZSBHUEVSRjsKIAotb3BlbiBIRUFE RVIsICI+Q1NTUHJvcGVydHlOYW1lcy5oIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuIENTU1Byb3Bl cnR5TmFtZXMuaCBmb3Igd3JpdGluZyI7CitvcGVuIEhFQURFUiwgIj5DU1NQcm9wZXJ0eU5hbWVz LmguaW50IiBvciBkaWUgIkNvdWxkIG5vdCBvcGVuIENTU1Byb3BlcnR5TmFtZXMuaC5pbnQgZm9y IHdyaXRpbmciOwogcHJpbnQgSEVBREVSIDw8ICJFT0YiOwogLyogVGhpcyBmaWxlIGlzIGF1dG9t YXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gJGlucHV0RmlsZSBieSBtYWtlcHJvcCwgZG8gbm90IGVk aXQgKi8KIApAQCAtODk0LDcgKzg5NCw3IEBAIHN1YiBnZW5lcmF0ZVZhbHVlU2V0dGVyIHsKICAg cmV0dXJuICRzZXR0ZXJDb250ZW50OwogfQogCi1vcGVuIFNUWUxFQlVJTERFUiwgIj5TdHlsZUJ1 aWxkZXIuY3BwIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVuIFN0eWxlQnVpbGRlci5jcHAgZm9yIHdy aXRpbmciOworb3BlbiBTVFlMRUJVSUxERVIsICI+U3R5bGVCdWlsZGVyLmNwcC5pbnQiIG9yIGRp ZSAiQ291bGQgbm90IG9wZW4gU3R5bGVCdWlsZGVyLmNwcC5pbnQgZm9yIHdyaXRpbmciOwogcHJp bnQgU1RZTEVCVUlMREVSIDw8ICJFT0YiOwogLyogVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkg Z2VuZXJhdGVkIGZyb20gJGlucHV0RmlsZSBieSBtYWtlcHJvcCwgZG8gbm90IGVkaXQgKi8KIApA QCAtOTY5LDcgKzk2OSw3IEBAIEVPRgogY2xvc2UgU1RZTEVCVUlMREVSOwogCiAjIEdlbmVyYXRl IFN0eWxlUHJvcGVydHlTaG9ydGhhbmRzRnVuY3Rpb25zLgotb3BlbiBTSE9SVEhBTkRTX0gsICI+ U3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5oIiB8fCBkaWUgIkNvdWxkIG5vdCBvcGVu IFN0eWxlUHJvcGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuaCBmb3Igd3JpdGluZyI7CitvcGVuIFNI T1JUSEFORFNfSCwgIj5TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmguaW50IiBvciBk aWUgIkNvdWxkIG5vdCBvcGVuIFN0eWxlUHJvcGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuaC5pbnQg Zm9yIHdyaXRpbmciOwogcHJpbnQgU0hPUlRIQU5EU19IIDw8ICJFT0YiOwogLyogVGhpcyBmaWxl IGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gJGlucHV0RmlsZSBieSBtYWtlcHJvcCwg ZG8gbm90IGVkaXQgKi8KIApAQCAtOTk1LDcgKzk5NSw3IEBAIEVPRgogCiBjbG9zZSBTSE9SVEhB TkRTX0g7CiAKLW9wZW4gU0hPUlRIQU5EU19DUFAsICI+U3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1 bmN0aW9ucy5jcHAiIHx8IGRpZSAiQ291bGQgbm90IG9wZW4gU3R5bGVQcm9wZXJ0eVNob3J0aGFu ZEZ1bmN0aW9ucy5jcHAgZm9yIHdyaXRpbmciOworb3BlbiBTSE9SVEhBTkRTX0NQUCwgIj5TdHls ZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNwcC5pbnQiIG9yIGRpZSAiQ291bGQgbm90IG9w ZW4gU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5jcHAuaW50IGZvciB3cml0aW5nIjsK IHByaW50IFNIT1JUSEFORFNfQ1BQIDw8ICJFT0YiOwogLyogVGhpcyBmaWxlIGlzIGF1dG9tYXRp Y2FsbHkgZ2VuZXJhdGVkIGZyb20gJGlucHV0RmlsZSBieSBtYWtlcHJvcCwgZG8gbm90IGVkaXQg Ki8KIApAQCAtMTEwNyw4ICsxMTA3LDMgQEAgcHJpbnQgU0hPUlRIQU5EU19DUFAgPDwgIkVPRiI7 CiBFT0YKIAogY2xvc2UgU0hPUlRIQU5EU19DUFA7Ci0KLWlmIChub3QgJGdwZXJmKSB7Ci0gICAg JGdwZXJmID0gJEVOVntHUEVSRn0gPyAkRU5We0dQRVJGfSA6ICJncGVyZiI7Ci19Ci1zeXN0ZW0o IlwiJGdwZXJmXCIgLS1rZXktcG9zaXRpb25zPVwiKlwiIC1EIC1uIC1zIDIgQ1NTUHJvcGVydHlO YW1lcy5ncGVyZiAtLW91dHB1dC1maWxlPUNTU1Byb3BlcnR5TmFtZXMuY3BwIikgPT0gMCB8fCBk aWUgImNhbGxpbmcgZ3BlcmYgZmFpbGVkOiAkPyI7Cg==