197668 2019-05-07 11:59:19 -0700 Add option to build-webkit to control whether or not XCBuild is used 2021-05-05 05:40:26 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin achristensen ap commit-queue dbates jbedard lforschler thorton webkit-bug-importer oldest_to_newest 1534014 0 krollin 2019-05-07 11:59:19 -0700 Add --[no-]xcbuild to build-webkit to force the use of XCBuild or not. Also update build-webkit and the makefiles with the foundation for automatically using XCBuild when the conditions allow it. This latter facility is currently turned off until Xcode fully supports building WebKit with XCBuild. 1534015 1 webkit-bug-importer 2019-05-07 11:59:30 -0700 <rdar://problem/50549728> 1534020 2 369309 krollin 2019-05-07 12:08:58 -0700 Created attachment 369309 Patch 1534030 3 369309 thorton 2019-05-07 12:16:52 -0700 Comment on attachment 369309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369309&action=review > Tools/Scripts/build-webkit:76 > +my $xcbuild = -1; undef is also an option > Makefile.shared:48 > + CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()') 😲 1534041 4 krollin 2019-05-07 12:36:22 -0700 (In reply to Tim Horton from comment #3) > Comment on attachment 369309 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=369309&action=review > > > Tools/Scripts/build-webkit:76 > > +my $xcbuild = -1; > > undef is also an option Thanks. My perl is a bit rusty and I'd forgotten this. I actually did a web search for the idiomatic approach to tri-state variables, but didn't turn that one up. > > > Makefile.shared:48 > > + CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()') > > 😲 I don't understand what you mean by that. 1534063 5 thorton 2019-05-07 12:59:10 -0700 (In reply to Keith Rollin from comment #4) > (In reply to Tim Horton from comment #3) > > Comment on attachment 369309 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=369309&action=review > > > > > Tools/Scripts/build-webkit:76 > > > +my $xcbuild = -1; > > > > undef is also an option > > Thanks. My perl is a bit rusty and I'd forgotten this. I actually did a web > search for the idiomatic approach to tri-state variables, but didn't turn > that one up. OK! > > > > > Makefile.shared:48 > > > + CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()') > > > > 😲 > > I don't understand what you mean by that. Nothing actionable, just pretend that's what my face looked like while reading. 1534064 6 369309 achristensen 2019-05-07 13:00:05 -0700 Comment on attachment 369309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369309&action=review >>> Makefile.shared:48 >>> + CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()') >> >> 😲 > > I don't understand what you mean by that. This is the most duct tape line of code I've ever seen. 1534065 7 369318 krollin 2019-05-07 13:00:09 -0700 Created attachment 369318 Do the undef thing. 1534066 8 krollin 2019-05-07 13:01:08 -0700 (In reply to Alex Christensen from comment #6) > Comment on attachment 369309 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=369309&action=review > > >>> Makefile.shared:48 > >>> + CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()') > >> > >> 😲 > > > > I don't understand what you mean by that. > > This is the most duct tape line of code I've ever seen. What would you prefer? 1534078 9 achristensen 2019-05-07 13:14:40 -0700 CMake 1534129 10 369318 commit-queue 2019-05-07 14:38:33 -0700 Comment on attachment 369318 Do the undef thing. Clearing flags on attachment: 369318 Committed r245037: <https://trac.webkit.org/changeset/245037> 1534130 11 commit-queue 2019-05-07 14:38:35 -0700 All reviewed patches have been landed. Closing bug. 1756911 12 gsnedders 2021-05-05 05:40:26 -0700 *** Bug 198589 has been marked as a duplicate of this bug. *** 369309 2019-05-07 12:08:58 -0700 2019-05-07 13:00:07 -0700 Patch bug-197668-20190507120857.patch text/plain 5316 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MDIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2VkNTkwYTU0ZmQzMTA0YWMwYmQ2YzI4ZjgzMzJmNjFl ODMyZjIxMi4uODg2YTI2OTc5OWNkZTJkZDlhYmRkY2YzZjBmZDk1NjA2ZDZmZjk4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDE5LTA1LTA3ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAg ICAgICBBZGQgb3B0aW9uIHRvIGJ1aWxkLXdlYmtpdCB0byBjb250cm9sIHdoZXRoZXIgb3Igbm90 IFhDQnVpbGQgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk3NjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDU0OTcyOD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgLS1bbm8tXXhj YnVpbGQgdG8gYnVpbGQtd2Via2l0IHRvIGZvcmNlIHRoZSB1c2Ugb2YgWENCdWlsZCBvciBub3Qu CisgICAgICAgIEFsc28gdXBkYXRlIGJ1aWxkLXdlYmtpdCBhbmQgdGhlIG1ha2VmaWxlcyB3aXRo IHRoZSBmb3VuZGF0aW9uIGZvcgorICAgICAgICBhdXRvbWF0aWNhbGx5IHVzaW5nIFhDQnVpbGQg d2hlbiB0aGUgY29uZGl0aW9ucyBhbGxvdyBpdC4gVGhpcyBsYXR0ZXIKKyAgICAgICAgZmFjaWxp dHkgaXMgY3VycmVudGx5IHR1cm5lZCBvZmYgdW50aWwgWGNvZGUgZnVsbHkgc3VwcG9ydHMgYnVp bGRpbmcKKyAgICAgICAgV2ViS2l0IHdpdGggWENCdWlsZC4KKworICAgICAgICAqIFNjcmlwdHMv YnVpbGQtd2Via2l0OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAg KFhjb2RlT3B0aW9ucyk6CisgICAgICAgIChjYW5Vc2VYQ0J1aWxkKToKKwogMjAxOS0wNS0wNyAg QWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtG bGF0cGFrXSB3ZWJraXQtYnVpbGQgZmFpbHMgZHVlIHRvIG1pc3NpbmcgR1RLMiBpbiBidWlsZCBl bnZpcm9ubWVudApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9Ub29s cy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCA2NTlhODY3ZjgxNWY4MjQwNjgwMDU1MmQ5MWNl MGIxYzhhZTNjNmRiLi5lNWE0NzJlNjMzMzRhZGQxMzE1MTFjNDI5M2E3MWE0ZTU4ZWYyY2ZmIDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRz L2J1aWxkLXdlYmtpdApAQCAtNzMsNiArNzMsNyBAQCBteSAkY292ZXJhZ2VTdXBwb3J0ID0gMDsK IG15ICRzaG91bGRSdW5TdGF0aWNBbmFseXplciA9IDA7CiBteSAkbm9FeHBlcmltZW50YWxGZWF0 dXJlcyA9IDA7CiBteSAkbHRvTW9kZSA9ICJkZWZhdWx0IjsKK215ICR4Y2J1aWxkID0gLTE7CiBt eSAkc3RhcnRUaW1lID0gdGltZSgpOwogbXkgJGFyY2hzMzJiaXQgPSAwOwogbXkgJHNraXBMaWJy YXJ5VXBkYXRlID0gMDsKQEAgLTExNSw2ICsxMTYsNyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtv cHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KICAgLS1jb3ZlcmFnZSAg ICAgICAgICAgICAgICAgICAgICAgIEVuYWJsZSBjb2RlIGNvdmVyYWdlIHN1cHBvcnQgKE1hYyBv bmx5KQogICAtLWFuYWx5emUgICAgICAgICAgICAgICAgICAgICAgICAgRW5hYmxlIHN0YXRpYyBh bmF5bHNpcyAoaU9TIGFuZCBNYWMgb25seSkKICAgLS1sdG8tbW9kZT08bW9kZT4gICAgICAgICAg ICAgICAgIFNldCBMaW5rIFRpbWUgT3B0aW1pemF0aW9uIG1vZGUgKGZ1bGwsIHRoaW4sIG9yIG5v bmUpIChMTFZNIG9ubHkpCisgIC0tW25vLV14Y2J1aWxkICAgICAgICAgICAgICAgICAgICBGb3Jj ZSB0aGUgdXNlIG9mIFhDQnVpbGQgb3Igbm90CiAKICAgLS1ndGsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEJ1aWxkIHRoZSBHVEsrIHBvcnQKICAgLS13cGUgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEJ1aWxkIHRoZSBXUEUgcG9ydApAQCAtMTUzLDYgKzE1NSw3IEBAIG15ICVvcHRp b25zID0gKAogICAgICdhbmFseXplJyA9PiBcJHNob3VsZFJ1blN0YXRpY0FuYWx5emVyLAogICAg ICduby1leHBlcmltZW50YWwtZmVhdHVyZXMnID0+IFwkbm9FeHBlcmltZW50YWxGZWF0dXJlcywK ICAgICAnbHRvLW1vZGU9cycgPT4gXCRsdG9Nb2RlLAorICAgICd4Y2J1aWxkIScgPT4gXCR4Y2J1 aWxkLAogICAgICdza2lwLWxpYnJhcnktdXBkYXRlJyA9PiBcJHNraXBMaWJyYXJ5VXBkYXRlLAog ICAgICd1c2UtY2NhY2hlIScgPT4gXCR1c2VDQ2FjaGUsCiApOwpAQCAtMjA3LDYgKzIxMCwxOCBA QCBteSBAb3B0aW9ucyA9ICgpOwogCiBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICBw dXNoIEBvcHRpb25zLCBYY29kZU9wdGlvbnMoKTsKKworICAgIGlmICgkeGNidWlsZCA8IDApIHsK KyAgICAgICAgJHhjYnVpbGQgPSBjYW5Vc2VYQ0J1aWxkKCk7CisgICAgfQorCisgICAgaWYgKCR4 Y2J1aWxkID4gMCkgeworICAgICAgICBwdXNoIEBvcHRpb25zLCAiLVVzZU5ld0J1aWxkU3lzdGVt PVlFUyI7CisgICAgICAgIHB1c2ggQG9wdGlvbnMsICJVU0VfTkVXX0JVSUxEX1NZU1RFTT1ZRVMi OworICAgIH0gZWxzaWYgKCR4Y2J1aWxkID09IDApIHsKKyAgICAgICAgcHVzaCBAb3B0aW9ucywg Ii1Vc2VOZXdCdWlsZFN5c3RlbT1OTyI7CisgICAgfQorCiAgICAgc3ViIG9wdGlvbigkJCkKICAg ICB7CiAgICAgICAgIG15ICgkZmVhdHVyZSwgJGlzRW5hYmxlZCkgPSBAXzsKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCBiMTE2OGZlNTViZjRiMDIzZGM5ZGNmMDM2OTFhMGQ2ODEyYWJhZjIxLi5mMGZmODFk ODI2OTgyOTYzNWRhMGE5YjJjOTkzMTUwZjc5MGM4YjU5IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC04 NDksNyArODQ5LDYgQEAgc3ViIFhjb2RlT3B0aW9ucwogICAgIGRldGVybWluZVhjb2RlU0RLKCk7 CiAKICAgICBteSBAb3B0aW9uczsKLSAgICBwdXNoIEBvcHRpb25zLCAiLVVzZU5ld0J1aWxkU3lz dGVtPU5PIjsKICAgICBwdXNoIEBvcHRpb25zLCAiLVVzZVNhbml0aXplZEJ1aWxkU3lzdGVtRW52 aXJvbm1lbnQ9WUVTIjsKICAgICBwdXNoIEBvcHRpb25zLCAiLVNob3dCdWlsZE9wZXJhdGlvbkR1 cmF0aW9uPVlFUyI7CiAgICAgcHVzaCBAb3B0aW9ucywgKCItY29uZmlndXJhdGlvbiIsICRjb25m aWd1cmF0aW9uKTsKQEAgLTg5NSw2ICs4OTQsMTEgQEAgc3ViIFhjb2RlU3RhdGljQW5hbHl6ZXJP cHRpb24oKQogICAgIHJldHVybiAiUlVOX0NMQU5HX1NUQVRJQ19BTkFMWVpFUj1ZRVMiOwogfQog CitzdWIgY2FuVXNlWENCdWlsZCgpCit7CisgICAgcmV0dXJuIDA7Cit9CisKIG15ICRwYXNzZWRD b25maWd1cmF0aW9uOwogbXkgJHNlYXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlvbjsKIHN1YiBk ZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFu Z2VMb2cKaW5kZXggMDM0YTIwMWE4ZWJjODAxYWE2ZjYwM2NiN2Y0ZjE5YzRmZWRjOGQxYS4uYmUy ODdhMDFjOGJhMWUxMGNkNThhYzI3NTk4ZTZjYjJkNmNmNzRjMCAxMDA2NDQKLS0tIGEvQ2hhbmdl TG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA1LTA3ICBLZWl0aCBS b2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgb3B0aW9uIHRvIGJ1aWxk LXdlYmtpdCB0byBjb250cm9sIHdoZXRoZXIgb3Igbm90IFhDQnVpbGQgaXMgdXNlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NjY4CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81MDU0OTcyOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgLS1bbm8tXXhjYnVpbGQgdG8gYnVpbGQtd2Via2l0IHRv IGZvcmNlIHRoZSB1c2Ugb2YgWENCdWlsZCBvciBub3QuCisgICAgICAgIEFsc28gdXBkYXRlIGJ1 aWxkLXdlYmtpdCBhbmQgdGhlIG1ha2VmaWxlcyB3aXRoIHRoZSBmb3VuZGF0aW9uIGZvcgorICAg ICAgICBhdXRvbWF0aWNhbGx5IHVzaW5nIFhDQnVpbGQgd2hlbiB0aGUgY29uZGl0aW9ucyBhbGxv dyBpdC4gVGhpcyBsYXR0ZXIKKyAgICAgICAgZmFjaWxpdHkgaXMgY3VycmVudGx5IHR1cm5lZCBv ZmYgdW50aWwgWGNvZGUgZnVsbHkgc3VwcG9ydHMgYnVpbGRpbmcKKyAgICAgICAgV2ViS2l0IHdp dGggWENCdWlsZC4KKworICAgICAgICAqIE1ha2VmaWxlLnNoYXJlZDoKKwogMjAxOS0wNS0wNiAg Q2hyaXN0b3BoZXIgUmVpZCAgPGNocmlzLnJlaWRAc29ueS5jb20+CiAKICAgICAgICAgW0NNYWtl XSBmdXNlLWxkIHNob3VsZCBhbHNvIGJlIHNldCBpbiBtb2R1bGUgbGlua2VyIGZsYWdzCmRpZmYg LS1naXQgYS9NYWtlZmlsZS5zaGFyZWQgYi9NYWtlZmlsZS5zaGFyZWQKaW5kZXggYTE4NTQ3YmU4 YTY1NTU4OWFiNDhmNmJkOTEzZWUxNzM2MjY0NDNmNS4uODVmMGNiN2FjYzRhMDhhYWRmNjYyNzU3 YjE0MGM3YjIxZjA5YTE1NCAxMDA2NDQKLS0tIGEvTWFrZWZpbGUuc2hhcmVkCisrKyBiL01ha2Vm aWxlLnNoYXJlZApAQCAtNDQsNiArNDQsMTYgQEAgaWZlcSAoLCAkKGZpbmRzdHJpbmcgV0tfVVNF X0NDQUNIRSwgJChBUkdTKSkpCiAJZW5kaWYKIGVuZGlmCiAKK2lmZXEgKCQoZmluZHN0cmluZyBV c2VOZXdCdWlsZFN5c3RlbSwkKEFSR1MpKSwpCisJQ0FOX1VTRV9YQ0JVSUxEID0gJChzaGVsbCBw ZXJsIC1JJChTQ1JJUFRTX1BBVEgpIC1Nd2Via2l0ZGlycyAtZSAncHJpbnQgY2FuVXNlWENCdWls ZCgpJykKKwlpZmVxICgkKENBTl9VU0VfWENCVUlMRCksMSkKKwkJWENPREVfT1BUSU9OUyArPSAt VXNlTmV3QnVpbGRTeXN0ZW09WUVTCisJCVhDT0RFX09QVElPTlMgKz0gVVNFX05FV19CVUlMRF9T WVNURU09WUVTCisJZWxzZQorCQlYQ09ERV9PUFRJT05TICs9IC1Vc2VOZXdCdWlsZFN5c3RlbT1O TworCWVuZGlmCitlbmRpZgorCiBERUZBVUxUX1ZFUkJPU0lUWSA6PSAkKHNoZWxsIGRlZmF1bHRz IHJlYWQgb3JnLndlYmtpdC5CdWlsZENvbmZpZ3VyYXRpb24gQnVpbGRUcmFuc2NyaXB0VmVyYm9z aXR5IDI+L2Rldi9udWxsIHx8IGVjaG8gImRlZmF1bHQiKQogVkVSQk9TSVRZID89ICQoREVGQVVM VF9WRVJCT1NJVFkpCiAK 369318 2019-05-07 13:00:09 -0700 2019-05-07 14:38:33 -0700 Do the undef thing. bug-197668-20190507130008.patch text/plain 5298 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MDIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2VkNTkwYTU0ZmQzMTA0YWMwYmQ2YzI4ZjgzMzJmNjFl ODMyZjIxMi4uZTkyMjFlNGY2NzhiNWNkN2QzN2U1Mzg0MmFmMTc3ZTZlZWEyZTZlMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDE5LTA1LTA3ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAg ICAgICBBZGQgb3B0aW9uIHRvIGJ1aWxkLXdlYmtpdCB0byBjb250cm9sIHdoZXRoZXIgb3Igbm90 IFhDQnVpbGQgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk3NjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDU0OTcyOD4KKworICAg ICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZCAtLVtuby1deGNidWls ZCB0byBidWlsZC13ZWJraXQgdG8gZm9yY2UgdGhlIHVzZSBvZiBYQ0J1aWxkIG9yIG5vdC4KKyAg ICAgICAgQWxzbyB1cGRhdGUgYnVpbGQtd2Via2l0IGFuZCB0aGUgbWFrZWZpbGVzIHdpdGggdGhl IGZvdW5kYXRpb24gZm9yCisgICAgICAgIGF1dG9tYXRpY2FsbHkgdXNpbmcgWENCdWlsZCB3aGVu IHRoZSBjb25kaXRpb25zIGFsbG93IGl0LiBUaGlzIGxhdHRlcgorICAgICAgICBmYWNpbGl0eSBp cyBjdXJyZW50bHkgdHVybmVkIG9mZiB1bnRpbCBYY29kZSBmdWxseSBzdXBwb3J0cyBidWlsZGlu ZworICAgICAgICBXZWJLaXQgd2l0aCBYQ0J1aWxkLgorCisgICAgICAgICogU2NyaXB0cy9idWls ZC13ZWJraXQ6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoWGNv ZGVPcHRpb25zKToKKyAgICAgICAgKGNhblVzZVhDQnVpbGQpOgorCiAyMDE5LTA1LTA3ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0ZsYXRw YWtdIHdlYmtpdC1idWlsZCBmYWlscyBkdWUgdG8gbWlzc2luZyBHVEsyIGluIGJ1aWxkIGVudmly b25tZW50CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0CmluZGV4IDY1OWE4NjdmODE1ZjgyNDA2ODAwNTUyZDkxY2UwYjFj OGFlM2M2ZGIuLmUzZTAwYWRhODRmOTM0MTAzNzY2ZDZlYmNhYzI0YTY2MDhjZmE0MzUgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVp bGQtd2Via2l0CkBAIC03Myw2ICs3Myw3IEBAIG15ICRjb3ZlcmFnZVN1cHBvcnQgPSAwOwogbXkg JHNob3VsZFJ1blN0YXRpY0FuYWx5emVyID0gMDsKIG15ICRub0V4cGVyaW1lbnRhbEZlYXR1cmVz ID0gMDsKIG15ICRsdG9Nb2RlID0gImRlZmF1bHQiOworbXkgJHhjYnVpbGQgPSB1bmRlZjsKIG15 ICRzdGFydFRpbWUgPSB0aW1lKCk7CiBteSAkYXJjaHMzMmJpdCA9IDA7CiBteSAkc2tpcExpYnJh cnlVcGRhdGUgPSAwOwpAQCAtMTE1LDYgKzExNiw3IEBAIFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29w dGlvbnNdIFtvcHRpb25zIHRvIHBhc3MgdG8gYnVpbGQgc3lzdGVtXQogICAtLWNvdmVyYWdlICAg ICAgICAgICAgICAgICAgICAgICAgRW5hYmxlIGNvZGUgY292ZXJhZ2Ugc3VwcG9ydCAoTWFjIG9u bHkpCiAgIC0tYW5hbHl6ZSAgICAgICAgICAgICAgICAgICAgICAgICBFbmFibGUgc3RhdGljIGFu YXlsc2lzIChpT1MgYW5kIE1hYyBvbmx5KQogICAtLWx0by1tb2RlPTxtb2RlPiAgICAgICAgICAg ICAgICAgU2V0IExpbmsgVGltZSBPcHRpbWl6YXRpb24gbW9kZSAoZnVsbCwgdGhpbiwgb3Igbm9u ZSkgKExMVk0gb25seSkKKyAgLS1bbm8tXXhjYnVpbGQgICAgICAgICAgICAgICAgICAgIEZvcmNl IHRoZSB1c2Ugb2YgWENCdWlsZCBvciBub3QKIAogICAtLWd0ayAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgQnVpbGQgdGhlIEdUSysgcG9ydAogICAtLXdwZSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgQnVpbGQgdGhlIFdQRSBwb3J0CkBAIC0xNTMsNiArMTU1LDcgQEAgbXkgJW9wdGlv bnMgPSAoCiAgICAgJ2FuYWx5emUnID0+IFwkc2hvdWxkUnVuU3RhdGljQW5hbHl6ZXIsCiAgICAg J25vLWV4cGVyaW1lbnRhbC1mZWF0dXJlcycgPT4gXCRub0V4cGVyaW1lbnRhbEZlYXR1cmVzLAog ICAgICdsdG8tbW9kZT1zJyA9PiBcJGx0b01vZGUsCisgICAgJ3hjYnVpbGQhJyA9PiBcJHhjYnVp bGQsCiAgICAgJ3NraXAtbGlicmFyeS11cGRhdGUnID0+IFwkc2tpcExpYnJhcnlVcGRhdGUsCiAg ICAgJ3VzZS1jY2FjaGUhJyA9PiBcJHVzZUNDYWNoZSwKICk7CkBAIC0yMDcsNiArMjEwLDE4IEBA IG15IEBvcHRpb25zID0gKCk7CiAKIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgIHB1 c2ggQG9wdGlvbnMsIFhjb2RlT3B0aW9ucygpOworCisgICAgaWYgKG5vdCBkZWZpbmVkICR4Y2J1 aWxkKSB7CisgICAgICAgICR4Y2J1aWxkID0gY2FuVXNlWENCdWlsZCgpOworICAgIH0KKworICAg IGlmICgkeGNidWlsZCkgeworICAgICAgICBwdXNoIEBvcHRpb25zLCAiLVVzZU5ld0J1aWxkU3lz dGVtPVlFUyI7CisgICAgICAgIHB1c2ggQG9wdGlvbnMsICJVU0VfTkVXX0JVSUxEX1NZU1RFTT1Z RVMiOworICAgIH0gZWxzZSB7CisgICAgICAgIHB1c2ggQG9wdGlvbnMsICItVXNlTmV3QnVpbGRT eXN0ZW09Tk8iOworICAgIH0KKwogICAgIHN1YiBvcHRpb24oJCQpCiAgICAgewogICAgICAgICBt eSAoJGZlYXR1cmUsICRpc0VuYWJsZWQpID0gQF87CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggYjExNjhm ZTU1YmY0YjAyM2RjOWRjZjAzNjkxYTBkNjgxMmFiYWYyMS4uZjBmZjgxZDgyNjk4Mjk2MzVkYTBh OWIyYzk5MzE1MGY3OTBjOGI1OSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtODQ5LDcgKzg0OSw2IEBA IHN1YiBYY29kZU9wdGlvbnMKICAgICBkZXRlcm1pbmVYY29kZVNESygpOwogCiAgICAgbXkgQG9w dGlvbnM7Ci0gICAgcHVzaCBAb3B0aW9ucywgIi1Vc2VOZXdCdWlsZFN5c3RlbT1OTyI7CiAgICAg cHVzaCBAb3B0aW9ucywgIi1Vc2VTYW5pdGl6ZWRCdWlsZFN5c3RlbUVudmlyb25tZW50PVlFUyI7 CiAgICAgcHVzaCBAb3B0aW9ucywgIi1TaG93QnVpbGRPcGVyYXRpb25EdXJhdGlvbj1ZRVMiOwog ICAgIHB1c2ggQG9wdGlvbnMsICgiLWNvbmZpZ3VyYXRpb24iLCAkY29uZmlndXJhdGlvbik7CkBA IC04OTUsNiArODk0LDExIEBAIHN1YiBYY29kZVN0YXRpY0FuYWx5emVyT3B0aW9uKCkKICAgICBy ZXR1cm4gIlJVTl9DTEFOR19TVEFUSUNfQU5BTFlaRVI9WUVTIjsKIH0KIAorc3ViIGNhblVzZVhD QnVpbGQoKQoreworICAgIHJldHVybiAwOworfQorCiBteSAkcGFzc2VkQ29uZmlndXJhdGlvbjsK IG15ICRzZWFyY2hlZEZvclBhc3NlZENvbmZpZ3VyYXRpb247CiBzdWIgZGV0ZXJtaW5lUGFzc2Vk Q29uZmlndXJhdGlvbgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDAz NGEyMDFhOGViYzgwMWFhNmY2MDNjYjdmNGYxOWM0ZmVkYzhkMWEuLjg5MGIyZDhmOTRiNzQxZWYy Nzk2ZWRhMjVlOTAwNzg1NjQ1YWE3ZTggMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOS0wNS0wNyAgS2VpdGggUm9sbGluICA8a3JvbGxp bkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG9wdGlvbiB0byBidWlsZC13ZWJraXQgdG8gY29u dHJvbCB3aGV0aGVyIG9yIG5vdCBYQ0J1aWxkIGlzIHVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzY2OAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNTA1NDk3Mjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAg ICBBZGQgLS1bbm8tXXhjYnVpbGQgdG8gYnVpbGQtd2Via2l0IHRvIGZvcmNlIHRoZSB1c2Ugb2Yg WENCdWlsZCBvciBub3QuCisgICAgICAgIEFsc28gdXBkYXRlIGJ1aWxkLXdlYmtpdCBhbmQgdGhl IG1ha2VmaWxlcyB3aXRoIHRoZSBmb3VuZGF0aW9uIGZvcgorICAgICAgICBhdXRvbWF0aWNhbGx5 IHVzaW5nIFhDQnVpbGQgd2hlbiB0aGUgY29uZGl0aW9ucyBhbGxvdyBpdC4gVGhpcyBsYXR0ZXIK KyAgICAgICAgZmFjaWxpdHkgaXMgY3VycmVudGx5IHR1cm5lZCBvZmYgdW50aWwgWGNvZGUgZnVs bHkgc3VwcG9ydHMgYnVpbGRpbmcKKyAgICAgICAgV2ViS2l0IHdpdGggWENCdWlsZC4KKworICAg ICAgICAqIE1ha2VmaWxlLnNoYXJlZDoKKwogMjAxOS0wNS0wNiAgQ2hyaXN0b3BoZXIgUmVpZCAg PGNocmlzLnJlaWRAc29ueS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBmdXNlLWxkIHNob3VsZCBh bHNvIGJlIHNldCBpbiBtb2R1bGUgbGlua2VyIGZsYWdzCmRpZmYgLS1naXQgYS9NYWtlZmlsZS5z aGFyZWQgYi9NYWtlZmlsZS5zaGFyZWQKaW5kZXggYTE4NTQ3YmU4YTY1NTU4OWFiNDhmNmJkOTEz ZWUxNzM2MjY0NDNmNS4uODVmMGNiN2FjYzRhMDhhYWRmNjYyNzU3YjE0MGM3YjIxZjA5YTE1NCAx MDA2NDQKLS0tIGEvTWFrZWZpbGUuc2hhcmVkCisrKyBiL01ha2VmaWxlLnNoYXJlZApAQCAtNDQs NiArNDQsMTYgQEAgaWZlcSAoLCAkKGZpbmRzdHJpbmcgV0tfVVNFX0NDQUNIRSwgJChBUkdTKSkp CiAJZW5kaWYKIGVuZGlmCiAKK2lmZXEgKCQoZmluZHN0cmluZyBVc2VOZXdCdWlsZFN5c3RlbSwk KEFSR1MpKSwpCisJQ0FOX1VTRV9YQ0JVSUxEID0gJChzaGVsbCBwZXJsIC1JJChTQ1JJUFRTX1BB VEgpIC1Nd2Via2l0ZGlycyAtZSAncHJpbnQgY2FuVXNlWENCdWlsZCgpJykKKwlpZmVxICgkKENB Tl9VU0VfWENCVUlMRCksMSkKKwkJWENPREVfT1BUSU9OUyArPSAtVXNlTmV3QnVpbGRTeXN0ZW09 WUVTCisJCVhDT0RFX09QVElPTlMgKz0gVVNFX05FV19CVUlMRF9TWVNURU09WUVTCisJZWxzZQor CQlYQ09ERV9PUFRJT05TICs9IC1Vc2VOZXdCdWlsZFN5c3RlbT1OTworCWVuZGlmCitlbmRpZgor CiBERUZBVUxUX1ZFUkJPU0lUWSA6PSAkKHNoZWxsIGRlZmF1bHRzIHJlYWQgb3JnLndlYmtpdC5C dWlsZENvbmZpZ3VyYXRpb24gQnVpbGRUcmFuc2NyaXB0VmVyYm9zaXR5IDI+L2Rldi9udWxsIHx8 IGVjaG8gImRlZmF1bHQiKQogVkVSQk9TSVRZID89ICQoREVGQVVMVF9WRVJCT1NJVFkpCiAK