216806 2020-09-21 15:40:00 -0700 Refactor build rules in Makefiles and Makefile.shared 2020-09-22 15:26:45 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin darin ddkilzer mark.lam saam webkit-bug-importer oldest_to_newest 1690559 0 krollin 2020-09-21 15:40:00 -0700 Factor out the common aspects of the build rules in Makefile.shared and the various Makefiles. This allows us to more easily see what's different between the various build targets, and to apply uniform changes across all of the targets. 1690561 1 webkit-bug-importer 2020-09-21 15:42:00 -0700 <rdar://problem/69332316> 1690562 2 409329 krollin 2020-09-21 15:43:55 -0700 Created attachment 409329 Patch 1690563 3 krollin 2020-09-21 15:44:53 -0700 David, I really did a number on your set-sanitizer-configuration target. I think that what remains is equivalent to what you'd been doing, but I didn't understand all of what you'd implemented, so I'm not sure. 1690784 4 409329 ddkilzer 2020-09-22 11:17:07 -0700 Comment on attachment 409329 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409329&action=review r=me > Source/Makefile:22 > + @$(build_target_for_each_module) This doesn't need to be @$(call build_target_for_each_module) as done in Makefile.shared? Is that because we don't need to pass arguments? > Makefile.shared:101 > + [[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \ I'm sorry, what does `[[ -t 1 ]]` do?! > Makefile.shared:123 > + @$(call set_webkit_configuration,--debug --force-optimization-level=O3) This won't pass `--debug --force-optimization-level=O3` as a single string to the shell, will it? 1690787 5 krollin 2020-09-22 11:29:21 -0700 (In reply to David Kilzer (:ddkilzer) from comment #4) > Comment on attachment 409329 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=409329&action=review > > r=me > > > Source/Makefile:22 > > + @$(build_target_for_each_module) > > This doesn't need to be @$(call build_target_for_each_module) as done in > Makefile.shared? Is that because we don't need to pass arguments? Correct. > > > Makefile.shared:101 > > + [[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \ > > I'm sorry, what does `[[ -t 1 ]]` do?! It checks to see if the specified file descriptor (in this case, stdout) is associated with a terminal. > > > Makefile.shared:123 > > + @$(call set_webkit_configuration,--debug --force-optimization-level=O3) > > This won't pass `--debug --force-optimization-level=O3` as a single string > to the shell, will it? No. I checked for that. `Make` performs a simply text replacement and then processes the resulting string. 1690788 6 ews-feeder 2020-09-22 11:37:56 -0700 Committed r267424: <https://trac.webkit.org/changeset/267424> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409329. 1690887 7 krollin 2020-09-22 15:26:45 -0700 Committed r267441: <https://trac.webkit.org/changeset/267441> 409329 2020-09-21 15:43:55 -0700 2020-09-22 11:37:56 -0700 Patch bug-216806-20200921154354.patch text/plain 14658 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9DaGFuZ2VMb2cKaW5kZXggZWQ5YzkxYTUx MDg5YWU4NDNkYjdiMDMyMTFmODEzOThmMDRhNzg2Ny4uN2JlMjYwYTIyNjRhZDI1YmM5M2VmZWMy ZmQyOWI4YjI2NjE0YzNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIw LTA5LTIxICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZh Y3RvciBidWlsZCBydWxlcyBpbiBNYWtlZmlsZXMgYW5kIE1ha2VmaWxlLnNoYXJlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2ODA2CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS82OTMzMjMxNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGYWN0b3Igb3V0IHRoZSBjb21tb24gYXNwZWN0cyBvZiB0aGUg YnVpbGQgcnVsZXMgaW4gTWFrZWZpbGUuc2hhcmVkCisgICAgICAgIGFuZCB0aGUgdmFyaW91cyBN YWtlZmlsZXMuIFRoaXMgYWxsb3dzIHVzIHRvIG1vcmUgZWFzaWx5IHNlZSB3aGF0J3MKKyAgICAg ICAgZGlmZmVyZW50IGJldHdlZW4gdGhlIHZhcmlvdXMgYnVpbGQgdGFyZ2V0cywgYW5kIHRvIGFw cGx5IHVuaWZvcm0KKyAgICAgICAgY2hhbmdlcyBhY3Jvc3MgYWxsIG9mIHRoZSB0YXJnZXRzLgor CisgICAgICAgICogTWFrZWZpbGU6CisKIDIwMjAtMDgtMDUgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGFsbCByZWZlcmVuY2VzIHRvIG5v bi1leGlzdGVudCAxMC4xNgpkaWZmIC0tZ2l0IGEvU291cmNlL01ha2VmaWxlIGIvU291cmNlL01h a2VmaWxlCmluZGV4IGVkMzM1Y2U5NjgwNDNjNGRhZWIyZmY4ZDlmMzllYzQ0OGQ2Mzc5Y2EuLmJm Y2E5MTI0NzA5MjYyZGJiOTI2ODg2NDMwNjQ4ZmM1MDZlOTUyMDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9NYWtlZmlsZQorKysgYi9Tb3VyY2UvTWFrZWZpbGUKQEAgLTEwLDMwICsxMCwzMSBAQCBlbmRp ZgogCiBNT0RVTEVTID0gYm1hbGxvYyBXVEYgSmF2YVNjcmlwdENvcmUgVGhpcmRQYXJ0eSBXZWJD b3JlICQoV0VCSU5TUEVDVE9SVUlfTU9EVUxFKSBXZWJLaXRMZWdhY3kgV2ViS2l0CiAKK2RlZmlu ZSBidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlCisJZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBk byBcCisJCSR7TUFLRX0gJEAgLUMgJCRkaXIgUEFUSF9GUk9NX1JPT1Q9JChQQVRIX0ZST01fUk9P VCkvJCR7ZGlyfTsgXAorCQlleGl0X3N0YXR1cz0kJD87IFwKKwkJWyAkJGV4aXRfc3RhdHVzIC1u ZSAwIF0gJiYgZXhpdCAkJGV4aXRfc3RhdHVzOyBcCisJZG9uZTsgdHJ1ZQorZW5kZWYKKwogYWxs OgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRf c3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRl eGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQog CiBkZWJ1ZyBkOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRk aXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVu IGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hf bW9kdWxlKQogCiByZWxlYXNlIHI6Ci0JQGZvciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtNQUtF fSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0dXM9JCQ/OyBcCi0JaWYgWyAkJGV4aXRfc3RhdHVzIC1u ZSAwIF07IHRoZW4gZXhpdCAkJGV4aXRfc3RhdHVzOyBmaTsgZG9uZQorCUAkKGJ1aWxkX3Rhcmdl dF9mb3JfZWFjaF9tb2R1bGUpCiAKIHJlbGVhc2UrYXNzZXJ0IHJhOgotCUBmb3IgZGlyIGluICQo TU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlm IFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRv bmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiB0ZXN0aW5nIHQ6Ci0JQGZv ciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0dXM9 JCQ/OyBcCi0JaWYgWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF07IHRoZW4gZXhpdCAkJGV4aXRfc3Rh dHVzOyBmaTsgZG9uZQorCUAkKGJ1aWxkX3RhcmdldF9mb3JfZWFjaF9tb2R1bGUpCiAKIGFuYWx5 emU6Ci0JQGZvciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhp dF9zdGF0dXM9JCQ/OyBcCi0JaWYgWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF07IHRoZW4gZXhpdCAk JGV4aXRfc3RhdHVzOyBmaTsgZG9uZQorCUAkKGJ1aWxkX3RhcmdldF9mb3JfZWFjaF9tb2R1bGUp CiAKIGNsZWFuOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRk aXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVu IGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hf bW9kdWxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvTWFrZWZpbGUgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9NYWtlZmlsZQppbmRleCBmMjgwMzJjYjNhNWU0MzM2MmFmYWFmMzk5ZjQxODA5 ZGY5MGM3ZGUwLi5mZmE0YjFkYmFlOGJhODEwMGI4ZjcxZmYxYWQ0MTMwOWIzNDhkMzZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9NYWtlZmlsZQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9NYWtlZmlsZQpAQCAtMjQsMzAgKzI0LDMxIEBAIGVuZGlmCiAKIE1PRFVMRVMgPSBBTkdMRSAk KExJQldFQlJUQ19NT0RVTEUpCiAKK2RlZmluZSBidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxl CisJZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyBcCisJCSR7TUFLRX0gJEAgLUMgJCRkaXIgUEFU SF9GUk9NX1JPT1Q9JChQQVRIX0ZST01fUk9PVCkvJCR7ZGlyfTsgXAorCQlleGl0X3N0YXR1cz0k JD87IFwKKwkJWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF0gJiYgZXhpdCAkJGV4aXRfc3RhdHVzOyBc CisJZG9uZTsgdHJ1ZQorZW5kZWYKKwogYWxsOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRv ICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0 YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWls ZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiBkZWJ1ZyBkIGRldmVsb3BtZW50IGRldiBkZXZl bG9wOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4 aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQg JCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxl KQogCiByZWxlYXNlIHIgZGVwbG95bWVudCBkZXAgZGVwbG95OgotCUBmb3IgZGlyIGluICQoTU9E VUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsg JCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUK KwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiByZWxlYXNlK2Fzc2VydCByYToK LQlAZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyAke01BS0V9ICRAIC1DICQkZGlyOyBleGl0X3N0 YXR1cz0kJD87IFwKLQlpZiBbICQkZXhpdF9zdGF0dXMgLW5lIDAgXTsgdGhlbiBleGl0ICQkZXhp dF9zdGF0dXM7IGZpOyBkb25lCisJQCQoYnVpbGRfdGFyZ2V0X2Zvcl9lYWNoX21vZHVsZSkKIAog dGVzdGluZyB0OgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRk aXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVu IGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hf bW9kdWxlKQogCiBhbmFseXplOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0g JEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUg MCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRf Zm9yX2VhY2hfbW9kdWxlKQogCiBjbGVhbjoKLQlAZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyAk e01BS0V9ICRAIC1DICQkZGlyOyBleGl0X3N0YXR1cz0kJD87IFwKLQlpZiBbICQkZXhpdF9zdGF0 dXMgLW5lIDAgXTsgdGhlbiBleGl0ICQkZXhpdF9zdGF0dXM7IGZpOyBkb25lCisJQCQoYnVpbGRf dGFyZ2V0X2Zvcl9lYWNoX21vZHVsZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCA5OWU4ZDc5ZDhiYTQyZDdjM2I4Yjg1YWQ5MzAxZTg2MDdhODIz YzhkLi40NjlhNDJkMDEzMGU5NjRmYjNmYzQ2ODJmOGVhY2FhNWZjNmViMDIwIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMjAtMDktMjEgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAg IFJlZmFjdG9yIGJ1aWxkIHJ1bGVzIGluIE1ha2VmaWxlcyBhbmQgTWFrZWZpbGUuc2hhcmVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY4MDYKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5MzMyMzE2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZhY3RvciBvdXQgdGhlIGNvbW1vbiBhc3BlY3RzIG9m IHRoZSBidWlsZCBydWxlcyBpbiBNYWtlZmlsZS5zaGFyZWQKKyAgICAgICAgYW5kIHRoZSB2YXJp b3VzIE1ha2VmaWxlcy4gVGhpcyBhbGxvd3MgdXMgdG8gbW9yZSBlYXNpbHkgc2VlIHdoYXQncwor ICAgICAgICBkaWZmZXJlbnQgYmV0d2VlbiB0aGUgdmFyaW91cyBidWlsZCB0YXJnZXRzLCBhbmQg dG8gYXBwbHkgdW5pZm9ybQorICAgICAgICBjaGFuZ2VzIGFjcm9zcyBhbGwgb2YgdGhlIHRhcmdl dHMuCisKKyAgICAgICAgKiBNYWtlZmlsZToKKwogMjAyMC0wOS0yMSAgSmlld2VuIFRhbiAgPGpp ZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0gRG9uJ3Qgc2V0IHRoZSBV ViBvcHRpb24gaWYgdGhlIGF1dGhlbnRpY2F0b3IgZG9lc24ndCBzdXBwb3J0IGl0CmRpZmYgLS1n aXQgYS9Ub29scy9NYWtlZmlsZSBiL1Rvb2xzL01ha2VmaWxlCmluZGV4IDYwYmIwM2E5MGZmNDcy ZDEzMDA5NzU1M2U4M2I0NDU5N2U0MjZkZGMuLjMwOTQ3ODk5NjRiNTBhZmEzYTc2NDJiNTZlMzQ3 YzQyZTg4OWViNWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01ha2VmaWxlCisrKyBiL1Rvb2xzL01ha2Vm aWxlCkBAIC0yMCwzMCArMjAsMzEgQEAgaWZlcSAoaW9zbWFjLCQoU0RLX1ZBUklBTlQpKQogCU1P RFVMRVMgPSBEdW1wUmVuZGVyVHJlZSBXZWJLaXRUZXN0UnVubmVyIC4uL1NvdXJjZS9UaGlyZFBh cnR5L2d0ZXN0L3hjb2RlIFRlc3RXZWJLaXRBUEkKIGVuZGlmCiAKK2RlZmluZSBidWlsZF90YXJn ZXRfZm9yX2VhY2hfbW9kdWxlCisJZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyBcCisJCSR7TUFL RX0gJEAgLUMgJCRkaXIgUEFUSF9GUk9NX1JPT1Q9JChQQVRIX0ZST01fUk9PVCkvJCR7ZGlyfTsg XAorCQlleGl0X3N0YXR1cz0kJD87IFwKKwkJWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF0gJiYgZXhp dCAkJGV4aXRfc3RhdHVzOyBcCisJZG9uZTsgdHJ1ZQorZW5kZWYKKwogYWxsOgotCUBmb3IgZGly IGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsg XAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsg Zmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiBkZWJ1ZyBkIGRl dmVsb3BtZW50IGRldiBkZXZlbG9wOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFL RX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAt bmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJn ZXRfZm9yX2VhY2hfbW9kdWxlKQogCiByZWxlYXNlIHIgZGVwbG95bWVudCBkZXAgZGVwbG95Ogot CUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3Rh dHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0 X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiBy ZWxlYXNlK2Fzc2VydCByYToKLQlAZm9yIGRpciBpbiAkKE1PRFVMRVMpOyBkbyAke01BS0V9ICRA IC1DICQkZGlyOyBleGl0X3N0YXR1cz0kJD87IFwKLQlpZiBbICQkZXhpdF9zdGF0dXMgLW5lIDAg XTsgdGhlbiBleGl0ICQkZXhpdF9zdGF0dXM7IGZpOyBkb25lCisJQCQoYnVpbGRfdGFyZ2V0X2Zv cl9lYWNoX21vZHVsZSkKIAogdGVzdGluZyB0OgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRv ICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0 YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWls ZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiBhbmFseXplOgotCUBmb3IgZGlyIGluICQoTU9E VUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsg JCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUK KwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiBjbGVhbjoKLQlAZm9yIGRpciBp biAkKE1PRFVMRVMpOyBkbyAke01BS0V9ICRAIC1DICQkZGlyOyBleGl0X3N0YXR1cz0kJD87IFwK LQlpZiBbICQkZXhpdF9zdGF0dXMgLW5lIDAgXTsgdGhlbiBleGl0ICQkZXhpdF9zdGF0dXM7IGZp OyBkb25lCisJQCQoYnVpbGRfdGFyZ2V0X2Zvcl9lYWNoX21vZHVsZSkKZGlmZiAtLWdpdCBhL0No YW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA2NWI0NTllZDA1N2JhNTVjNzE4NDk1ZTI1MzkwODI1 YjkxNGNiNTc4Li4zZjQ1ZDVmNDQ3NDg5MmNhMDIwMmMxZDYwMmEyZmExM2FhMWZhMjljIDEwMDY0 NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAt MDktMjEgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFj dG9yIGJ1aWxkIHJ1bGVzIGluIE1ha2VmaWxlcyBhbmQgTWFrZWZpbGUuc2hhcmVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY4MDYKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzY5MzMyMzE2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZhY3RvciBvdXQgdGhlIGNvbW1vbiBhc3BlY3RzIG9mIHRoZSBi dWlsZCBydWxlcyBpbiBNYWtlZmlsZS5zaGFyZWQKKyAgICAgICAgYW5kIHRoZSB2YXJpb3VzIE1h a2VmaWxlcy4gVGhpcyBhbGxvd3MgdXMgdG8gbW9yZSBlYXNpbHkgc2VlIHdoYXQncworICAgICAg ICBkaWZmZXJlbnQgYmV0d2VlbiB0aGUgdmFyaW91cyBidWlsZCB0YXJnZXRzLCBhbmQgdG8gYXBw bHkgdW5pZm9ybQorICAgICAgICBjaGFuZ2VzIGFjcm9zcyBhbGwgb2YgdGhlIHRhcmdldHMuCisK KyAgICAgICAgKiBNYWtlZmlsZToKKyAgICAgICAgKiBNYWtlZmlsZS5zaGFyZWQ6CisgICAgICAg ICogU291cmNlL01ha2VmaWxlOgorCiAyMDIwLTA5LTE2ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9u b3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gQWRkIGEgbmV3IGxpYnJhcnkg dGFyZ2V0IFRlc3RSdW5uZXJTaGFyZWQKZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUK aW5kZXggZjIxNWUzMGUzODZjMzIzOTYyOWY2ZDBlMjQ0ZDJmY2YyYzU1YTdjZS4uODllNWVhZDY3 NzE0NjNlNjU4NmQ5ZWVkNTExNTUyOGU0Mzg3OTU1NCAxMDA2NDQKLS0tIGEvTWFrZWZpbGUKKysr IGIvTWFrZWZpbGUKQEAgLTEsMjkgKzEsMzAgQEAKIE1PRFVMRVMgPSBXZWJLaXRMaWJyYXJpZXMg U291cmNlIFRvb2xzCiAKK2RlZmluZSBidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlCisJZm9y IGRpciBpbiAkKE1PRFVMRVMpOyBkbyBcCisJCSR7TUFLRX0gJEAgLUMgJCRkaXIgUEFUSF9GUk9N X1JPT1Q9JChQQVRIX0ZST01fUk9PVCkvJCR7ZGlyfTsgXAorCQlleGl0X3N0YXR1cz0kJD87IFwK KwkJWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF0gJiYgZXhpdCAkJGV4aXRfc3RhdHVzOyBcCisJZG9u ZTsgdHJ1ZQorZW5kZWYKKwogYWxsOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFL RX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAt bmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJn ZXRfZm9yX2VhY2hfbW9kdWxlKQogCiBkZWJ1ZyBkOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7 IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0 X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChi dWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQogCiByZWxlYXNlIHI6Ci0JQGZvciBkaXIgaW4g JChNT0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0dXM9JCQ/OyBcCi0J aWYgWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF07IHRoZW4gZXhpdCAkJGV4aXRfc3RhdHVzOyBmaTsg ZG9uZQorCUAkKGJ1aWxkX3RhcmdldF9mb3JfZWFjaF9tb2R1bGUpCiAKIHJlbGVhc2UrYXNzZXJ0 IHJhOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4 aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQg JCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChidWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxl KQogCiB0ZXN0aW5nIHQ6Ci0JQGZvciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAt QyAkJGRpcjsgZXhpdF9zdGF0dXM9JCQ/OyBcCi0JaWYgWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF07 IHRoZW4gZXhpdCAkJGV4aXRfc3RhdHVzOyBmaTsgZG9uZQorCUAkKGJ1aWxkX3RhcmdldF9mb3Jf ZWFjaF9tb2R1bGUpCiAKIGFuYWx5emU6Ci0JQGZvciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtN QUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0dXM9JCQ/OyBcCi0JaWYgWyAkJGV4aXRfc3RhdHVz IC1uZSAwIF07IHRoZW4gZXhpdCAkJGV4aXRfc3RhdHVzOyBmaTsgZG9uZQorCUAkKGJ1aWxkX3Rh cmdldF9mb3JfZWFjaF9tb2R1bGUpCiAKIGNsZWFuOgotCUBmb3IgZGlyIGluICQoTU9EVUxFUyk7 IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVzPSQkPzsgXAotCWlmIFsgJCRleGl0 X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0YXR1czsgZmk7IGRvbmUKKwlAJChi dWlsZF90YXJnZXRfZm9yX2VhY2hfbW9kdWxlKQpkaWZmIC0tZ2l0IGEvTWFrZWZpbGUuc2hhcmVk IGIvTWFrZWZpbGUuc2hhcmVkCmluZGV4IDIwMzk0Y2M1NTM2ODkxYTNkYjdkYjk3MmRjZGY5NTJm YWQyYzQzZGIuLjVmNmIzNWIzYzM4ZjI1NjBhZDY0MDUxMzVlMTgxYzY0MzM5MzQyNjIgMTAwNjQ0 Ci0tLSBhL01ha2VmaWxlLnNoYXJlZAorKysgYi9NYWtlZmlsZS5zaGFyZWQKQEAgLTEsNiArMSw1 IEBACiBTQ1JJUFRTX1BBVEggPz0gLi4vVG9vbHMvU2NyaXB0cwogCi1TRVRfQ09MT1JfRElBR05P U1RJQ1NfQVJHID0gaWYgW1sgLXQgMSBdXTsgdGhlbiBDT0xPUl9ESUFHTk9TVElDU19BUkc9IkNP TE9SX0RJQUdOT1NUSUNTPVlFUyI7IGZpCiBYQ09ERV9PUFRJT05TID0gYHBlcmwgLUkkKFNDUklQ VFNfUEFUSCkgLU13ZWJraXRkaXJzIC1lICdwcmludCBYY29kZU9wdGlvblN0cmluZygpJyAtLSAk KEJVSUxEX1dFQktJVF9PUFRJT05TKWAgJCR7Q09MT1JfRElBR05PU1RJQ1NfQVJHfSAkKEFSR1Mp CiAKIGlmbmVxICgsJChTREtST09UKSkKQEAgLTkyLDQyICs5MSw0NyBAQCBleHBvcnQgRFNZTVVU SUxfTlVNX1RIUkVBRFMgPSAkKHNoZWxsIHN5c2N0bCAtbiBody5hY3RpdmVjcHUpCiAjIFNlZSA8 cmRhcjovL3Byb2JsZW0vMTY0NjYxOTY+LgogZXhwb3J0IFBBVEggPSAkKHNoZWxsIGdldGNvbmYg UEFUSCkKIAotYWxsOiBzZXRfc2FuaXRpemVyX2NvbmZpZ3VyYXRpb24KLQkoICQoU0VUX0NPTE9S X0RJQUdOT1NUSUNTX0FSRyk7IHhjb2RlYnVpbGQgJChPVEhFUl9PUFRJT05TKSAkKFhDT0RFX09Q VElPTlMpIEdDQ19QUkVQUk9DRVNTT1JfREVGSU5JVElPTlM9JyQoR0NDX1BSRVBST0NFU1NPUl9B RERJVElPTlMpICQkKGluaGVyaXRlZCknIHwgJChPVVRQVVRfRklMVEVSKSAmJiBleGl0ICQke1BJ UEVTVEFUVVNbMF19ICkKKworZGVmaW5lIHNldF93ZWJraXRfY29uZmlndXJhdGlvbgorCSQoU0NS SVBUU19QQVRIKS9zZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gJDEgJChBU0FOX09QVElPTikgJChU U0FOX09QVElPTikgJChXS19MVE9fT1BUSU9OKQorZW5kZWYKKworZGVmaW5lIGludm9rZV94Y29k ZQorCSggXAorCQlbWyAtdCAxIF1dICYmIENPTE9SX0RJQUdOT1NUSUNTX0FSRz0iQ09MT1JfRElB R05PU1RJQ1M9WUVTIjsgXAorCQkkMSB4Y29kZWJ1aWxkICQoT1RIRVJfT1BUSU9OUykgJChYQ09E RV9PUFRJT05TKSAkMiB8ICQoT1VUUFVUX0ZJTFRFUikgJiYgZXhpdCAkJHtQSVBFU1RBVFVTWzBd fSBcCisJKQorZW5kZWYKKworYWxsOgorCUAkKGNhbGwgc2V0X3dlYmtpdF9jb25maWd1cmF0aW9u LCkKKwlAJChjYWxsIGludm9rZV94Y29kZSwsR0NDX1BSRVBST0NFU1NPUl9ERUZJTklUSU9OUz0n JChHQ0NfUFJFUFJPQ0VTU09SX0FERElUSU9OUykgJCQoaW5oZXJpdGVkKScpCiAKIGRlYnVnIGQg ZGV2ZWxvcG1lbnQgZGV2IGRldmVsb3A6IGZvcmNlCi0JJChTQ1JJUFRTX1BBVEgpL3NldC13ZWJr aXQtY29uZmlndXJhdGlvbiAtLWRlYnVnICQoQVNBTl9PUFRJT04pICQoVFNBTl9PUFRJT04pICQo V0tfTFRPX09QVElPTikKLQkoICQoU0VUX0NPTE9SX0RJQUdOT1NUSUNTX0FSRyk7IHhjb2RlYnVp bGQgJChPVEhFUl9PUFRJT05TKSAkKFhDT0RFX09QVElPTlMpIEdDQ19QUkVQUk9DRVNTT1JfREVG SU5JVElPTlM9JyQoR0NDX1BSRVBST0NFU1NPUl9BRERJVElPTlMpICQkKGluaGVyaXRlZCknIHwg JChPVVRQVVRfRklMVEVSKSAmJiBleGl0ICQke1BJUEVTVEFUVVNbMF19ICkKKwlAJChjYWxsIHNl dF93ZWJraXRfY29uZmlndXJhdGlvbiwtLWRlYnVnKQorCUAkKGNhbGwgaW52b2tlX3hjb2RlLCxH Q0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJT05TPSckKEdDQ19QUkVQUk9DRVNTT1JfQURESVRJT05T KSAkJChpbmhlcml0ZWQpJykKIAogcmVsZWFzZSByIGRlcGxveW1lbnQgZGVwIGRlcGxveTogZm9y Y2UKLQkkKFNDUklQVFNfUEFUSCkvc2V0LXdlYmtpdC1jb25maWd1cmF0aW9uIC0tcmVsZWFzZSAk KEFTQU5fT1BUSU9OKSAkKFRTQU5fT1BUSU9OKSAkKFdLX0xUT19PUFRJT04pCi0JKCAkKFNFVF9D T0xPUl9ESUFHTk9TVElDU19BUkcpOyB4Y29kZWJ1aWxkICQoT1RIRVJfT1BUSU9OUykgJChYQ09E RV9PUFRJT05TKSBHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJT05TPSckKEdDQ19QUkVQUk9DRVNT T1JfQURESVRJT05TKSAkJChpbmhlcml0ZWQpJyB8ICQoT1VUUFVUX0ZJTFRFUikgJiYgZXhpdCAk JHtQSVBFU1RBVFVTWzBdfSApCisJQCQoY2FsbCBzZXRfd2Via2l0X2NvbmZpZ3VyYXRpb24sLS1y ZWxlYXNlKQorCUAkKGNhbGwgaW52b2tlX3hjb2RlLCxHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJ T05TPSckKEdDQ19QUkVQUk9DRVNTT1JfQURESVRJT05TKSAkJChpbmhlcml0ZWQpJykKIAogcmVs ZWFzZSthc3NlcnQgcmE6IGZvcmNlCi0JJChTQ1JJUFRTX1BBVEgpL3NldC13ZWJraXQtY29uZmln dXJhdGlvbiAtLXJlbGVhc2UgJChBU0FOX09QVElPTikgJChUU0FOX09QVElPTikgJChXS19MVE9f T1BUSU9OKQotCSggJChTRVRfQ09MT1JfRElBR05PU1RJQ1NfQVJHKTsgeGNvZGVidWlsZCAkKE9U SEVSX09QVElPTlMpICQoWENPREVfT1BUSU9OUykgR0NDX1BSRVBST0NFU1NPUl9ERUZJTklUSU9O Uz0nJChHQ0NfUFJFUFJPQ0VTU09SX0FERElUSU9OUykgQVNTRVJUX0VOQUJMRUQ9MSAkJChpbmhl cml0ZWQpJyB8ICQoT1VUUFVUX0ZJTFRFUikgJiYgZXhpdCAkJHtQSVBFU1RBVFVTWzBdfSApCisJ QCQoY2FsbCBzZXRfd2Via2l0X2NvbmZpZ3VyYXRpb24sLS1yZWxlYXNlKQorCUAkKGNhbGwgaW52 b2tlX3hjb2RlLCxHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJT05TPSckKEdDQ19QUkVQUk9DRVNT T1JfQURESVRJT05TKSBBU1NFUlRfRU5BQkxFRD0xICQkKGluaGVyaXRlZCknKQogCiB0ZXN0aW5n IHQ6IGZvcmNlCi0JJChTQ1JJUFRTX1BBVEgpL3NldC13ZWJraXQtY29uZmlndXJhdGlvbiAtLWRl YnVnICQoQVNBTl9PUFRJT04pICQoVFNBTl9PUFRJT04pICQoV0tfTFRPX09QVElPTikgLS1mb3Jj ZS1vcHRpbWl6YXRpb24tbGV2ZWw9TzMKLQkoICQoU0VUX0NPTE9SX0RJQUdOT1NUSUNTX0FSRyk7 IHhjb2RlYnVpbGQgJChPVEhFUl9PUFRJT05TKSAkKFhDT0RFX09QVElPTlMpIEdDQ19QUkVQUk9D RVNTT1JfREVGSU5JVElPTlM9JyQoR0NDX1BSRVBST0NFU1NPUl9BRERJVElPTlMpICQkKGluaGVy aXRlZCknIHwgJChPVVRQVVRfRklMVEVSKSAmJiBleGl0ICQke1BJUEVTVEFUVVNbMF19ICkKKwlA JChjYWxsIHNldF93ZWJraXRfY29uZmlndXJhdGlvbiwtLWRlYnVnIC0tZm9yY2Utb3B0aW1pemF0 aW9uLWxldmVsPU8zKQorCUAkKGNhbGwgaW52b2tlX3hjb2RlLCxHQ0NfUFJFUFJPQ0VTU09SX0RF RklOSVRJT05TPSckKEdDQ19QUkVQUk9DRVNTT1JfQURESVRJT05TKSAkJChpbmhlcml0ZWQpJykK IAogYW5hbHl6ZToKLQkkKFNDUklQVFNfUEFUSCkvc2V0LXdlYmtpdC1jb25maWd1cmF0aW9uIC0t ZGVidWcgJChBU0FOX09QVElPTikgJChUU0FOX09QVElPTikgJChXS19MVE9fT1BUSU9OKQorCUAk KGNhbGwgc2V0X3dlYmtpdF9jb25maWd1cmF0aW9uLC0tZGVidWcpCiBpZm5kZWYgUEFUSF9UT19T Q0FOX0JVSUxECi0JKCAkKFNFVF9DT0xPUl9ESUFHTk9TVElDU19BUkcpOyB4Y29kZWJ1aWxkICQo T1RIRVJfT1BUSU9OUykgJChYQ09ERV9PUFRJT05TKSBHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJ T05TPSckKEdDQ19QUkVQUk9DRVNTT1JfQURESVRJT05TKSAkJChpbmhlcml0ZWQpJyBSVU5fQ0xB TkdfU1RBVElDX0FOQUxZWkVSPVlFUyB8ICQoT1VUUFVUX0ZJTFRFUikgJiYgZXhpdCAkJHtQSVBF U1RBVFVTWzBdfSApCisJQCQoY2FsbCBpbnZva2VfeGNvZGUsLEdDQ19QUkVQUk9DRVNTT1JfREVG SU5JVElPTlM9JyQoR0NDX1BSRVBST0NFU1NPUl9BRERJVElPTlMpICQkKGluaGVyaXRlZCknIFJV Tl9DTEFOR19TVEFUSUNfQU5BTFlaRVI9WUVTKQogZWxzZQotCSggJChTRVRfQ09MT1JfRElBR05P U1RJQ1NfQVJHKTsgJChQQVRIX1RPX1NDQU5fQlVJTEQpIHhjb2RlYnVpbGQgJChPVEhFUl9PUFRJ T05TKSAkKFhDT0RFX09QVElPTlMpIEdDQ19QUkVQUk9DRVNTT1JfREVGSU5JVElPTlM9JyQoR0ND X1BSRVBST0NFU1NPUl9BRERJVElPTlMpICQkKGluaGVyaXRlZCknIHwgJChPVVRQVVRfRklMVEVS KSAmJiBleGl0ICQke1BJUEVTVEFUVVNbMF19ICkKLWVuZGlmCi0KLXNldF9zYW5pdGl6ZXJfY29u ZmlndXJhdGlvbjoKLWlmbmVxICgsJChBU0FOX09QVElPTikpCi0JJChTQ1JJUFRTX1BBVEgpL3Nl dC13ZWJraXQtY29uZmlndXJhdGlvbiAkKEFTQU5fT1BUSU9OKQotZW5kaWYKLWlmbmVxICgsJChU U0FOX09QVElPTikpCi0JJChTQ1JJUFRTX1BBVEgpL3NldC13ZWJraXQtY29uZmlndXJhdGlvbiAk KFRTQU5fT1BUSU9OKQorCUAkKGNhbGwgaW52b2tlX3hjb2RlLCQoUEFUSF9UT19TQ0FOX0JVSUxE KSxHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJT05TPSckKEdDQ19QUkVQUk9DRVNTT1JfQURESVRJ T05TKSAkJChpbmhlcml0ZWQpJykKIGVuZGlmCiAKIGNsZWFuOgotCSggJChTRVRfQ09MT1JfRElB R05PU1RJQ1NfQVJHKTsgeGNvZGVidWlsZCAkKE9USEVSX09QVElPTlMpIC1hbGx0YXJnZXRzIGNs ZWFuICQoWENPREVfT1BUSU9OUykgfCAkKE9VVFBVVF9GSUxURVIpICYmIGV4aXQgJCR7UElQRVNU QVRVU1swXX0gKQorCUAkKGNhbGwgaW52b2tlX3hjb2RlLCwtYWxsdGFyZ2V0cyBjbGVhbikKIAog Zm9yY2U6IDsK