215064 2020-08-01 13:49:36 -0700 Fix and further refine makefile rule for WebKit messages generated files 2020-08-03 09:30:47 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215054 https://bugs.webkit.org/show_bug.cgi?id=211112 InRadar P2 Normal --- 1 darin darin krollin sam webkit-bug-importer oldest_to_newest 1677150 0 darin 2020-08-01 13:49:36 -0700 Fix and further refine makefile rule for WebKit messages generated files 1677151 1 405794 darin 2020-08-01 13:50:50 -0700 Created attachment 405794 Patch 1677161 2 sam 2020-08-01 14:58:13 -0700 I am surprised and confused to see this work on the bots. From my research, I didn't think the "grouped targets" feature came to make until make 4.3 (https://lwn.net/Articles/810071/), and at least on my local machine, make is stuck for macOS back on 3.81. What's the magic here? 1677164 3 darin 2020-08-01 15:35:06 -0700 Yes, the make on my computer is 3.81 yet this did work. 1677165 4 darin 2020-08-01 15:36:53 -0700 If we can’t use grouped targets, then at least we have to fix the spelling of "addsuffix". 1677166 5 darin 2020-08-01 15:37:58 -0700 Maybe grouped targets was undocumented in older versions of make? 1677167 6 darin 2020-08-01 15:38:49 -0700 Yes, that article says pretty clearly that grouped targets is new in make 4.3! 1677168 7 darin 2020-08-01 15:40:52 -0700 OK, tested locally and it seems that the syntax doesn't really work. 1677169 8 darin 2020-08-01 15:41:16 -0700 The make run succeeds, but it doesn't run the rule in all the cases I would expect. 1677170 9 405794 darin 2020-08-01 15:44:56 -0700 Comment on attachment 405794 Patch I think this patch just re-introduces the bug where the rule is run multiple times. 1677171 10 405798 darin 2020-08-01 15:49:42 -0700 Created attachment 405798 Patch 1677172 11 darin 2020-08-01 15:52:09 -0700 Thanks, Sam, for calling my attention to that! Should be fine now. 1677184 12 sam 2020-08-01 18:08:18 -0700 Realizing that we are forever stuck on make 3.81 a few weeks ago made me wonder if we should re-asses the use of make in WebKit (at least with regard to derived sources). I don't recall the reason for it being introduced, though I have heard it mentioned that it was maybe to do with deficiencies in Xcode's ability to deal with intermediate files, or maybe to share between Xcode and VisualStudio (really I should go look at svn history). Regardless of the original intent though, it's always a good idea to check assumptions every once in a while and make sure they still make sense. 1677185 13 ews-feeder 2020-08-01 18:18:25 -0700 Committed r265181: <https://trac.webkit.org/changeset/265181> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405798. 1677186 14 webkit-bug-importer 2020-08-01 18:19:15 -0700 <rdar://problem/66433599> 1677193 15 darin 2020-08-01 20:19:04 -0700 I seem to recall that I originally started using make with the goal of sharing those rules between all build systems. Was really disappointed when the file was replicated in CMake instead of being used there. 405794 2020-08-01 13:50:50 -0700 2020-08-01 15:49:41 -0700 Patch bug-215064-20200801135049.patch text/plain 4612 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzZWZlMDZhNzU3NjJiZDI0 YWI1MDBhMDRkNDY5ODU1YjQyMGJkOGIuLjhhYWFhMzQ4OTE2ZWFkYzVmNmYyZTA5ZjcyNzIxZjhm ZjUzMDM2NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDgtMDEgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBhbmQgZnVydGhlciByZWZpbmUg bWFrZWZpbGUgcnVsZSBmb3IgV2ViS2l0IG1lc3NhZ2VzIGdlbmVyYXRlZCBmaWxlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1MDY0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEZXJpdmVkU291cmNl cy1vdXRwdXQueGNmaWxlbGlzdDogVXBkYXRlZCBmb3IgYSBmaWxlIHRoYXQgd2FzIG9taXR0ZWQK KyAgICAgICAgYmVjYXVzZSBvZiBhIHR5cG8gaW4gdGhlIG1ha2VmaWxlLgorICAgICAgICAqIERl cml2ZWRTb3VyY2VzLm1ha2U6IFVzZSBhIGdyb3VwZWQgdGFyZ2V0IGluc3RlYWQgb2YgYSBwYXR0 ZXJuIHJ1bGUuCisKIDIwMjAtMDgtMDEgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFByZXZlbnQgbXVsdGlwbGUgaW52b2NhdGlvbnMgb2YgZ2VuZXJhdGUtbWVz c2FnZS1yZWNlaXZlci5weQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9EZXJpdmVkU291cmNl cy1vdXRwdXQueGNmaWxlbGlzdCBiL1NvdXJjZS9XZWJLaXQvRGVyaXZlZFNvdXJjZXMtb3V0cHV0 LnhjZmlsZWxpc3QKaW5kZXggMzNkNDIxYmE1NmYzYWU5ZmMwNThmY2ZlMDE3OWMyYjJlZDk2ODNh NC4uNTY4MmJlY2EyNzZkYTdlZDc3NDZkZWUzNjkwZmZhMzZmNTU3OTE3YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9EZXJpdmVkU291cmNlcy1vdXRwdXQueGNmaWxlbGlzdAorKysgYi9Tb3Vy Y2UvV2ViS2l0L0Rlcml2ZWRTb3VyY2VzLW91dHB1dC54Y2ZpbGVsaXN0CkBAIC0xNjksNiArMTY5 LDcgQEAgJChCVUlMVF9QUk9EVUNUU19ESVIpL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvUmVtb3Rl Q0RNUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCiAkKEJVSUxUX1BST0RVQ1RTX0RJUikvRGVyaXZl ZFNvdXJjZXMvV2ViS2l0Mi9SZW1vdGVDRE1Qcm94eU1lc3NhZ2VzLmgKICQoQlVJTFRfUFJPRFVD VFNfRElSKS9EZXJpdmVkU291cmNlcy9XZWJLaXQyL1JlbW90ZUNETVByb3h5TWVzc2FnZXNSZXBs aWVzLmgKICQoQlVJTFRfUFJPRFVDVFNfRElSKS9EZXJpdmVkU291cmNlcy9XZWJLaXQyL1JlbW90 ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyTWVzc2FnZVJlY2VpdmVyLmNwcAorJChCVUlMVF9QUk9EVUNU U19ESVIpL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvUmVtb3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXJN ZXNzYWdlcy5oCiAkKEJVSUxUX1BST0RVQ1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9S ZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdlck1lc3NhZ2VzUmVwbGllcy5oCiAkKEJVSUxUX1BST0RV Q1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJl YVByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcAogJChCVUlMVF9QUk9EVUNUU19ESVIpL0Rlcml2ZWRT b3VyY2VzL1dlYktpdDIvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eU1lc3NhZ2VzLmgK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvRGVyaXZlZFNvdXJjZXMubWFrZSBiL1NvdXJjZS9X ZWJLaXQvRGVyaXZlZFNvdXJjZXMubWFrZQppbmRleCBiZTg3NGQxNWJlY2ZjYjQxMjQ4MTY2MWQw Y2Y3MTg0ZTA0MGQzY2VkLi43NmEyMWMyMmFhODRiZjI4OWIyNWFiZWYyNTBhZDMzM2EzYWEzMGU4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0Rlcml2ZWRTb3VyY2VzLm1ha2UKKysrIGIvU291 cmNlL1dlYktpdC9EZXJpdmVkU291cmNlcy5tYWtlCkBAIC0xNTUsOCArMTU1LDggQEAgTUVTU0FH RV9SRUNFSVZFUlMgPSBcCiAJVUlQcm9jZXNzL21hYy9TZWNJdGVtU2hpbVByb3h5IFwKIAlVSVBy b2Nlc3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkgXAogCVVJUHJvY2Vzcy9Db2NvYS9QbGF5 YmFja1Nlc3Npb25NYW5hZ2VyUHJveHkgXAotCVVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyUHJveHkgXAogCVVJUHJvY2Vzcy9Db2NvYS9Vc2VyTWVkaWFDYXB0dXJlTWFuYWdl clByb3h5IFwKKwlVSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5IFwK IAlVSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5IFwKIAlVSVByb2Nlc3MvVmlld0dlc3R1 cmVDb250cm9sbGVyIFwKIAlVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5IFwKQEAgLTI0Miw4ICsy NDIsOSBAQCBNRVNTQUdFX1JFQ0VJVkVSUyA9IFwKIAlHUFVQcm9jZXNzL21lZGlhL1JlbW90ZUF1 ZGlvRGVzdGluYXRpb25NYW5hZ2VyIFwKICMKIAotU0NSSVBUUyA9IFwKLSAgICAkKFdlYktpdDIp L1NjcmlwdHMvZ2VuZXJhdGUtbWVzc2FnZS1yZWNlaXZlci5weSBcCitHRU5FUkFURV9NRVNTQUdF X1JFQ0VJVkVSX1NDUklQVCA9ICQoV2ViS2l0MikvU2NyaXB0cy9nZW5lcmF0ZS1tZXNzYWdlLXJl Y2VpdmVyLnB5CitHRU5FUkFURV9NRVNTQUdFX1JFQ0VJVkVSX1NDUklQVFMgPSBcCisgICAgJChH RU5FUkFURV9NRVNTQUdFX1JFQ0VJVkVSX1NDUklQVCkgXAogICAgICQoV2ViS2l0MikvU2NyaXB0 cy93ZWJraXQvX19pbml0X18ucHkgXAogICAgICQoV2ViS2l0MikvU2NyaXB0cy93ZWJraXQvbWVz c2FnZXMucHkgXAogICAgICQoV2ViS2l0MikvU2NyaXB0cy93ZWJraXQvbW9kZWwucHkgXApAQCAt MjU0LDI1ICsyNTUsMTggQEAgRlJBTUVXT1JLX0ZMQUdTIDo9ICQoc2hlbGwgZWNobyAkKEJVSUxU X1BST0RVQ1RTX0RJUikgJChGUkFNRVdPUktfU0VBUkNIX1BBVEhTKQogSEVBREVSX0ZMQUdTIDo9 ICQoc2hlbGwgZWNobyAkKEJVSUxUX1BST0RVQ1RTX0RJUikgJChIRUFERVJfU0VBUkNIX1BBVEhT KSAkKFNZU1RFTV9IRUFERVJfU0VBUkNIX1BBVEhTKSB8IHBlcmwgLWUgJ3ByaW50ICItSSIgLiBq b2luKCIgLUkiLCBzcGxpdCgiICIsIDw+KSk7JykKIAogTUVTU0FHRV9SRUNFSVZFUl9GSUxFUyA6 PSAkKGFkZHN1ZmZpeCBNZXNzYWdlUmVjZWl2ZXIuY3BwLCQobm90ZGlyICQoTUVTU0FHRV9SRUNF SVZFUlMpKSkKLU1FU1NBR0VTX0ZJTEVTIDo9ICQoYWRkc3VmaXggTWVzc2FnZXMuaCwkKG5vdGRp ciAkKE1FU1NBR0VfUkVDRUlWRVJTKSkpCitNRVNTQUdFU19GSUxFUyA6PSAkKGFkZHN1ZmZpeCBN ZXNzYWdlcy5oLCQobm90ZGlyICQoTUVTU0FHRV9SRUNFSVZFUlMpKSkKIE1FU1NBR0VfUkVQTElF U19GSUxFUyA6PSAkKGFkZHN1ZmZpeCBNZXNzYWdlc1JlcGxpZXMuaCwkKG5vdGRpciAkKE1FU1NB R0VfUkVDRUlWRVJTKSkpCi1NRVNTQUdFU19JTl9GSUxFUyA6PSAkKGFkZHN1ZmZpeCAubWVzc2Fn ZXMuaW4sJChNRVNTQUdFX1JFQ0VJVkVSUykpCitHRU5FUkFURURfTUVTU0FHRVNfRklMRVMgOj0g JChNRVNTQUdFX1JFQ0VJVkVSX0ZJTEVTKSAkKE1FU1NBR0VTX0ZJTEVTKSAkKE1FU1NBR0VfUkVQ TElFU19GSUxFUykKIAotTUVTU0FHRV9SRUNFSVZFUl9QQVRURVJOUyA6PSAkKHN1YnN0IC4sJSwk KE1FU1NBR0VfUkVDRUlWRVJfRklMRVMpKQotTUVTU0FHRVNfUEFUVEVSTlMgOj0gJChzdWJzdCAu LCUsJChNRVNTQUdFU19GSUxFUykpCi1NRVNTQUdFX1JFUExJRVNfUEFUVEVSTlMgOj0gJChzdWJz dCAuLCUsJChNRVNTQUdFX1JFUExJRVNfRklMRVMpKQorTUVTU0FHRVNfSU5fRklMRVMgOj0gJChh ZGRzdWZmaXggLm1lc3NhZ2VzLmluLCQoTUVTU0FHRV9SRUNFSVZFUlMpKQogCiAuUEhPTlkgOiBh bGwKIAotYWxsIDogXAotICAgICQoTUVTU0FHRV9SRUNFSVZFUl9GSUxFUykgXAotICAgICQoTUVT U0FHRVNfRklMRVMpIFwKLSAgICAkKE1FU1NBR0VfUkVQTElFU19GSUxFUykgXAotICAgIE1lc3Nh Z2VOYW1lcy5oIE1lc3NhZ2VOYW1lcy5jcHAgXAotIworYWxsIDogJChHRU5FUkFURURfTUVTU0FH RVNfRklMRVMpCiAKLSQoTUVTU0FHRV9SRUNFSVZFUl9QQVRURVJOUykgJChNRVNTQUdFU19QQVRU RVJOUykgJChNRVNTQUdFX1JFUExJRVNfUEFUVEVSTlMpIE1lc3NhZ2VOYW1lcyVoIE1lc3NhZ2VO YW1lcyVjcHAgOiAkKE1FU1NBR0VTX0lOX0ZJTEVTKSAkKFNDUklQVFMpCi0JcHl0aG9uICQoV2Vi S2l0MikvU2NyaXB0cy9nZW5lcmF0ZS1tZXNzYWdlLXJlY2VpdmVyLnB5ICQoV2ViS2l0MikgJChN RVNTQUdFX1JFQ0VJVkVSUykKKyQoR0VORVJBVEVEX01FU1NBR0VTX0ZJTEVTKSAmOiAkKE1FU1NB R0VTX0lOX0ZJTEVTKSAkKEdFTkVSQVRFX01FU1NBR0VfUkVDRUlWRVJfU0NSSVBUUykKKwlweXRo b24gJChHRU5FUkFURV9NRVNTQUdFX1JFQ0VJVkVSX1NDUklQVCkgJChXZWJLaXQyKSAkKE1FU1NB R0VfUkVDRUlWRVJTKQogCiBURVhUX1BSRVBST0NFU1NPUl9GTEFHUz0tRSAtUCAtdwogCg== 405798 2020-08-01 15:49:42 -0700 2020-08-01 18:18:25 -0700 Patch bug-215064-20200801154941.patch text/plain 4741 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzZWZlMDZhNzU3NjJiZDI0 YWI1MDBhMDRkNDY5ODU1YjQyMGJkOGIuLjhkZjU5YTI2M2ZmODUyZWQwMmVhYzAyNDk3M2VmYmRi NmQwZjNiNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDgtMDEgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBhbmQgZnVydGhlciByZWZpbmUg bWFrZWZpbGUgcnVsZSBmb3IgV2ViS2l0IG1lc3NhZ2VzIGdlbmVyYXRlZCBmaWxlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1MDY0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEZXJpdmVkU291cmNl cy1vdXRwdXQueGNmaWxlbGlzdDogVXBkYXRlZCBmb3IgYSBmaWxlIHRoYXQgd2FzIG9taXR0ZWQK KyAgICAgICAgYmVjYXVzZSBvZiBhIHR5cG8gaW4gdGhlIG1ha2VmaWxlLgorICAgICAgICAqIERl cml2ZWRTb3VyY2VzLm1ha2U6IEZpeCAiYWRkc3VmaXgiIHR5cG8gYW5kIHJlb3JnYW5pemVkIHRo aW5ncyBhIGJpdC4KKwogMjAyMC0wOC0wMSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUHJldmVudCBtdWx0aXBsZSBpbnZvY2F0aW9ucyBvZiBnZW5lcmF0ZS1t ZXNzYWdlLXJlY2VpdmVyLnB5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0Rlcml2ZWRTb3Vy Y2VzLW91dHB1dC54Y2ZpbGVsaXN0IGIvU291cmNlL1dlYktpdC9EZXJpdmVkU291cmNlcy1vdXRw dXQueGNmaWxlbGlzdAppbmRleCAzM2Q0MjFiYTU2ZjNhZTlmYzA1OGZjZmUwMTc5YzJiMmVkOTY4 M2E0Li41NjgyYmVjYTI3NmRhN2VkNzc0NmRlZTM2OTBmZmEzNmY1NTc5MTdjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0Rlcml2ZWRTb3VyY2VzLW91dHB1dC54Y2ZpbGVsaXN0CisrKyBiL1Nv dXJjZS9XZWJLaXQvRGVyaXZlZFNvdXJjZXMtb3V0cHV0LnhjZmlsZWxpc3QKQEAgLTE2OSw2ICsx NjksNyBAQCAkKEJVSUxUX1BST0RVQ1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9SZW1v dGVDRE1Qcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAKICQoQlVJTFRfUFJPRFVDVFNfRElSKS9EZXJp dmVkU291cmNlcy9XZWJLaXQyL1JlbW90ZUNETVByb3h5TWVzc2FnZXMuaAogJChCVUlMVF9QUk9E VUNUU19ESVIpL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvUmVtb3RlQ0RNUHJveHlNZXNzYWdlc1Jl cGxpZXMuaAogJChCVUlMVF9QUk9EVUNUU19ESVIpL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvUmVt b3RlQ2FwdHVyZVNhbXBsZU1hbmFnZXJNZXNzYWdlUmVjZWl2ZXIuY3BwCiskKEJVSUxUX1BST0RV Q1RTX0RJUikvRGVyaXZlZFNvdXJjZXMvV2ViS2l0Mi9SZW1vdGVDYXB0dXJlU2FtcGxlTWFuYWdl ck1lc3NhZ2VzLmgKICQoQlVJTFRfUFJPRFVDVFNfRElSKS9EZXJpdmVkU291cmNlcy9XZWJLaXQy L1JlbW90ZUNhcHR1cmVTYW1wbGVNYW5hZ2VyTWVzc2FnZXNSZXBsaWVzLmgKICQoQlVJTFRfUFJP RFVDVFNfRElSKS9EZXJpdmVkU291cmNlcy9XZWJLaXQyL1JlbW90ZUxheWVyVHJlZURyYXdpbmdB cmVhUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwCiAkKEJVSUxUX1BST0RVQ1RTX0RJUikvRGVyaXZl ZFNvdXJjZXMvV2ViS2l0Mi9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5TWVzc2FnZXMu aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9EZXJpdmVkU291cmNlcy5tYWtlIGIvU291cmNl L1dlYktpdC9EZXJpdmVkU291cmNlcy5tYWtlCmluZGV4IGJlODc0ZDE1YmVjZmNiNDEyNDgxNjYx ZDBjZjcxODRlMDQwZDNjZWQuLjc1MDk3N2E4ZDRiODljMjAzYjRkMzQzMzgwNDhlYTNiYTBiNmZl OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvRGVyaXZlZFNvdXJjZXMubWFrZQorKysgYi9T b3VyY2UvV2ViS2l0L0Rlcml2ZWRTb3VyY2VzLm1ha2UKQEAgLTE1NSw4ICsxNTUsOCBAQCBNRVNT QUdFX1JFQ0VJVkVSUyA9IFwKIAlVSVByb2Nlc3MvbWFjL1NlY0l0ZW1TaGltUHJveHkgXAogCVVJ UHJvY2Vzcy9XZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eSBcCiAJVUlQcm9jZXNzL0NvY29hL1Bs YXliYWNrU2Vzc2lvbk1hbmFnZXJQcm94eSBcCi0JVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNj cmVlbk1hbmFnZXJQcm94eSBcCiAJVUlQcm9jZXNzL0NvY29hL1VzZXJNZWRpYUNhcHR1cmVNYW5h Z2VyUHJveHkgXAorCVVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkg XAogCVVJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkgXAogCVVJUHJvY2Vzcy9WaWV3R2Vz dHVyZUNvbnRyb2xsZXIgXAogCVVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkgXApAQCAtMjQyLDgg KzI0Miw5IEBAIE1FU1NBR0VfUkVDRUlWRVJTID0gXAogCUdQVVByb2Nlc3MvbWVkaWEvUmVtb3Rl QXVkaW9EZXN0aW5hdGlvbk1hbmFnZXIgXAogIwogCi1TQ1JJUFRTID0gXAotICAgICQoV2ViS2l0 MikvU2NyaXB0cy9nZW5lcmF0ZS1tZXNzYWdlLXJlY2VpdmVyLnB5IFwKK0dFTkVSQVRFX01FU1NB R0VfUkVDRUlWRVJfU0NSSVBUID0gJChXZWJLaXQyKS9TY3JpcHRzL2dlbmVyYXRlLW1lc3NhZ2Ut cmVjZWl2ZXIucHkKK0dFTkVSQVRFX01FU1NBR0VfUkVDRUlWRVJfU0NSSVBUUyA9IFwKKyAgICAk KEdFTkVSQVRFX01FU1NBR0VfUkVDRUlWRVJfU0NSSVBUKSBcCiAgICAgJChXZWJLaXQyKS9TY3Jp cHRzL3dlYmtpdC9fX2luaXRfXy5weSBcCiAgICAgJChXZWJLaXQyKS9TY3JpcHRzL3dlYmtpdC9t ZXNzYWdlcy5weSBcCiAgICAgJChXZWJLaXQyKS9TY3JpcHRzL3dlYmtpdC9tb2RlbC5weSBcCkBA IC0yNTQsMjUgKzI1NSwyMCBAQCBGUkFNRVdPUktfRkxBR1MgOj0gJChzaGVsbCBlY2hvICQoQlVJ TFRfUFJPRFVDVFNfRElSKSAkKEZSQU1FV09SS19TRUFSQ0hfUEFUSFMpCiBIRUFERVJfRkxBR1Mg Oj0gJChzaGVsbCBlY2hvICQoQlVJTFRfUFJPRFVDVFNfRElSKSAkKEhFQURFUl9TRUFSQ0hfUEFU SFMpICQoU1lTVEVNX0hFQURFUl9TRUFSQ0hfUEFUSFMpIHwgcGVybCAtZSAncHJpbnQgIi1JIiAu IGpvaW4oIiAtSSIsIHNwbGl0KCIgIiwgPD4pKTsnKQogCiBNRVNTQUdFX1JFQ0VJVkVSX0ZJTEVT IDo9ICQoYWRkc3VmZml4IE1lc3NhZ2VSZWNlaXZlci5jcHAsJChub3RkaXIgJChNRVNTQUdFX1JF Q0VJVkVSUykpKQotTUVTU0FHRVNfRklMRVMgOj0gJChhZGRzdWZpeCBNZXNzYWdlcy5oLCQobm90 ZGlyICQoTUVTU0FHRV9SRUNFSVZFUlMpKSkKK01FU1NBR0VTX0ZJTEVTIDo9ICQoYWRkc3VmZml4 IE1lc3NhZ2VzLmgsJChub3RkaXIgJChNRVNTQUdFX1JFQ0VJVkVSUykpKQogTUVTU0FHRV9SRVBM SUVTX0ZJTEVTIDo9ICQoYWRkc3VmZml4IE1lc3NhZ2VzUmVwbGllcy5oLCQobm90ZGlyICQoTUVT U0FHRV9SRUNFSVZFUlMpKSkKLU1FU1NBR0VTX0lOX0ZJTEVTIDo9ICQoYWRkc3VmZml4IC5tZXNz YWdlcy5pbiwkKE1FU1NBR0VfUkVDRUlWRVJTKSkKIAotTUVTU0FHRV9SRUNFSVZFUl9QQVRURVJO UyA6PSAkKHN1YnN0IC4sJSwkKE1FU1NBR0VfUkVDRUlWRVJfRklMRVMpKQotTUVTU0FHRVNfUEFU VEVSTlMgOj0gJChzdWJzdCAuLCUsJChNRVNTQUdFU19GSUxFUykpCi1NRVNTQUdFX1JFUExJRVNf UEFUVEVSTlMgOj0gJChzdWJzdCAuLCUsJChNRVNTQUdFX1JFUExJRVNfRklMRVMpKQorR0VORVJB VEVEX01FU1NBR0VTX0ZJTEVTIDo9ICQoTUVTU0FHRV9SRUNFSVZFUl9GSUxFUykgJChNRVNTQUdF U19GSUxFUykgJChNRVNTQUdFX1JFUExJRVNfRklMRVMpIE1lc3NhZ2VOYW1lcy5oIE1lc3NhZ2VO YW1lcy5jcHAKK0dFTkVSQVRFRF9NRVNTQUdFU19GSUxFU19BU19QQVRURVJOUyA6PSAkKHN1YnN0 IC4sJSwkKEdFTkVSQVRFRF9NRVNTQUdFU19GSUxFUykpCisKK01FU1NBR0VTX0lOX0ZJTEVTIDo9 ICQoYWRkc3VmZml4IC5tZXNzYWdlcy5pbiwkKE1FU1NBR0VfUkVDRUlWRVJTKSkKIAogLlBIT05Z IDogYWxsCiAKLWFsbCA6IFwKLSAgICAkKE1FU1NBR0VfUkVDRUlWRVJfRklMRVMpIFwKLSAgICAk KE1FU1NBR0VTX0ZJTEVTKSBcCi0gICAgJChNRVNTQUdFX1JFUExJRVNfRklMRVMpIFwKLSAgICBN ZXNzYWdlTmFtZXMuaCBNZXNzYWdlTmFtZXMuY3BwIFwKLSMKK2FsbCA6ICQoR0VORVJBVEVEX01F U1NBR0VTX0ZJTEVTKQogCi0kKE1FU1NBR0VfUkVDRUlWRVJfUEFUVEVSTlMpICQoTUVTU0FHRVNf UEFUVEVSTlMpICQoTUVTU0FHRV9SRVBMSUVTX1BBVFRFUk5TKSBNZXNzYWdlTmFtZXMlaCBNZXNz YWdlTmFtZXMlY3BwIDogJChNRVNTQUdFU19JTl9GSUxFUykgJChTQ1JJUFRTKQotCXB5dGhvbiAk KFdlYktpdDIpL1NjcmlwdHMvZ2VuZXJhdGUtbWVzc2FnZS1yZWNlaXZlci5weSAkKFdlYktpdDIp ICQoTUVTU0FHRV9SRUNFSVZFUlMpCiskKEdFTkVSQVRFRF9NRVNTQUdFU19GSUxFU19BU19QQVRU RVJOUykgOiAkKE1FU1NBR0VTX0lOX0ZJTEVTKSAkKEdFTkVSQVRFX01FU1NBR0VfUkVDRUlWRVJf U0NSSVBUUykKKwlweXRob24gJChHRU5FUkFURV9NRVNTQUdFX1JFQ0VJVkVSX1NDUklQVCkgJChX ZWJLaXQyKSAkKE1FU1NBR0VfUkVDRUlWRVJTKQogCiBURVhUX1BSRVBST0NFU1NPUl9GTEFHUz0t RSAtUCAtdwogCg==