174664 2017-07-19 20:49:13 -0700 [CMake] Add an option to stop build after generating project files 2017-07-21 09:02:27 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 Yousuke.Kimoto webkit-unassigned achristensen annulen buildbot commit-queue dbates don.olmstead fujii lforschler oldest_to_newest 1330540 0 Yousuke.Kimoto 2017-07-19 20:49:13 -0700 Since developers sometimes need to check only project files generated by CMake before build, "nobuild" option will help them to check those files. The option can be used like: $ Tools/Scripts/build-webkit --debug --nobuild 1330572 1 315974 Yousuke.Kimoto 2017-07-20 00:13:54 -0700 Created attachment 315974 [PATCH] Add '--nobuild' option 1330574 2 315975 Yousuke.Kimoto 2017-07-20 00:22:29 -0700 Created attachment 315975 [PATCH] Add '--nobuild' option 1330628 3 315975 annulen 2017-07-20 08:35:55 -0700 Comment on attachment 315975 [PATCH] Add '--nobuild' option View in context: https://bugs.webkit.org/attachment.cgi?id=315975&action=review > Tools/Scripts/webkitdirs.pm:2177 > + return determineIsNoBuild(); determineIsNoBuild(); return $isNoBuild; Otherwise it will return undefined value when called second time 1330630 4 annulen 2017-07-20 08:37:41 -0700 BTW, build-webkit --no-build looks a bit... weird 1330669 5 don.olmstead 2017-07-20 10:36:08 -0700 Here are some ideas for the flag --skip-build --generate-projects-only Any other ideas annulen? 1330671 6 annulen 2017-07-20 10:39:11 -0700 I would prefer --generate-projects-only, though I'm equally fine with stopping build manually after generation is done 1330928 7 316073 Yousuke.Kimoto 2017-07-20 23:28:54 -0700 Created attachment 316073 [PATCH] Add '--generate-project-only' option Thank you for your comments. I applied your advises into the new patch. 1330973 8 316073 commit-queue 2017-07-21 09:02:25 -0700 Comment on attachment 316073 [PATCH] Add '--generate-project-only' option Clearing flags on attachment: 316073 Committed r219728: <http://trac.webkit.org/changeset/219728> 1330974 9 commit-queue 2017-07-21 09:02:27 -0700 All reviewed patches have been landed. Closing bug. 315974 2017-07-20 00:13:54 -0700 2017-07-20 00:22:29 -0700 [PATCH] Add '--nobuild' option bug_174664.patch text/plain 3332 Yousuke.Kimoto ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmNzg1 YzAyLi5iMGM0MGM1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTctMDctMTkgIFlvdXN1a2UgS2ltb3RvICA8WW91 c3VrZS5LaW1vdG9Ac29ueS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBBZGQgLS1ub2J1aWxkIG9w dGlvbiB0byBzdG9wIGJ1aWxkIGFmdGVyIGdlbmVyYXRpbmcgcHJvamVjdCBmaWxlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0NjY0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxk LXdlYmtpdDogQWRkICctLW5vYnVpbGQnIG9wdGlvbiBhbmQgYSBjaGVja2VyIHRvIHN0b3AgYnVp bGQgYWZ0ZXIgZ2VuZXJhdGluZyBjb25maWd1cmFpdG9uLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0ZGlycy5wbTogQWRkIGEgZnVuY3Rpb24gdG8gY2hlY2sgJy0tbm9idWlsZCcgb3B0aW9uIGFu ZCB0aGUgc2FtZSBjaGVja2VyIGFzIHRoZSBhYm92ZQorICAgICAgICAoYnVpbGRDTWFrZVByb2pl Y3RPckV4aXQpOiBBZGQgYSBjaGVrZXIgdG8gc3RvcCBidWlsZCBzdG9wIGJ1aWxkIGFmdGVyIGdl bmVyYXRpbmcgY29uZmlndXJhaXRvbi4KKyAgICAgICAgKGRldGVybWluZUlzTm9CdWlsZCk6IFRv IGNoZWNrIGlmICctLW5vYnVpbGQnIG9wdGlvbiBpcyBzcGVjaWZpZWQKKyAgICAgICAgKGlzTm9C dWlsZCk6IGRpdHRvCisKIDIwMTctMDctMTkgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgogCiAgICAgICAgIGxpbnQtdGVzdC1leHBlY3RhdGlvbnMgc2hvdWxkIGJlIHJ1biBk dXJpbmcgc3R5bGUgY2hlY2tpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXggYThkMmMyNi4uMWEzYzNmNyAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0 cy9idWlsZC13ZWJraXQKQEAgLTg5LDYgKzg5LDcgQEAgbXkgJHVzYWdlID0gPDxFT0Y7CiBVc2Fn ZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3Rl bV0KICAgLS1oZWxwICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNob3cgdGhpcyBoZWxwIG1l c3NhZ2UKICAgLS1jbGVhbiAgICAgICAgICAgICAgICAgICAgICAgICAgIENsZWFudXAgdGhlIGJ1 aWxkIGRpcmVjdG9yeQorICAtLW5vLWJ1aWxkICAgICAgICAgICAgICAgICAgICAgICAgT25seSBn ZW5lcmF0ZSBzb2x1dGlvbiBmaWxlIG9yIGJ1aWxkLm5pbmphCiAgIC0tZGVidWcgICAgICAgICAg ICAgICAgICAgICAgICAgICBDb21waWxlIHdpdGggRGVidWcgY29uZmlndXJhdGlvbgogICAtLXJl bGVhc2UgICAgICAgICAgICAgICAgICAgICAgICAgQ29tcGlsZSB3aXRoIFJlbGVhc2UgY29uZmln dXJhdGlvbgogICAtLXNkaz08c2RrPiAgICAgICAgICAgICAgICAgICAgICAgVXNlIGEgc3BlY2lm aWMgWGNvZGUgU0RLIChpT1MgYW5kIE1hYyBvbmx5KQpAQCAtMjYxLDYgKzI2Miw5IEBAIGlmIChp c0FwcGxlV2luV2ViS2l0KCkgfHwgaXNXaW5DYWlybygpKSB7CiAgICAgaWYgKGV4aXRTdGF0dXMo Z2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QoJHByZWZpeFBhdGgsIEBjbWFrZUFy Z3MpKSkgewogICAgICAgICBkaWUgIlJ1biBcIkM6L1Byb2dyYW0gRmlsZXMgKHg4NikvTWljcm9z b2Z0IFZpc3VhbCBTdHVkaW8gMTQuMC9WQy92Y3ZhcnNhbGwuYmF0XCIgYmVmb3JlIGJ1aWxkLXdl YmtpdCB3aGVuIHVzaW5nIG5pbmphIjsKICAgICB9CisKKyAgICBleGl0IDAgaWYgaXNOb0J1aWxk KCk7CisKICAgICBjaGRpcldlYktpdCgpOwogICAgIGlmIChjYW5Vc2VOaW5qYSgpKSB7CiAgICAg ICAgIGNoZGlyIEZpbGU6OlNwZWMtPmNhdGRpcigkYmFzZVByb2R1Y3REaXIsIGNvbmZpZ3VyYXRp b24oKSk7CkBAIC0yNzgsNiArMjgyLDggQEAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSB8fCBpc1dp bkNhaXJvKCkpIHsKICAgICAgICAgZXhpdCBleGl0U3RhdHVzKCRyZXN1bHQpOwogICAgIH0KIH0g ZWxzaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICFpc0NNYWtlQnVpbGQoKSkgeworICAgIGV4 aXQgMCBpZiBpc05vQnVpbGQoKTsKKwogICAgICMgQnVpbGQsIGFuZCBhYm9ydCBpZiB0aGUgYnVp bGQgZmFpbHMuCiAgICAgZm9yIG15ICRkaXIgKEBwcm9qZWN0cykgewogICAgICAgICBjaGRpciAk ZGlyIG9yIGRpZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBiMmMzMzIwLi5kMWU4ZGQ0IDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCkBAIC0xMzksNiArMTM5LDcgQEAgbXkgJG9zWFZlcnNpb247CiBteSAkaW9zVmVy c2lvbjsKIG15ICRnZW5lcmF0ZURzeW07CiBteSAkaXNDTWFrZUJ1aWxkOworbXkgJGlzTm9CdWls ZDsKIG15ICRpc1dpbjY0OwogbXkgJGlzSW5zcGVjdG9yRnJvbnRlbmQ7CiBteSAkcG9ydE5hbWU7 CkBAIC0yMTM1LDYgKzIxMzYsNyBAQCBzdWIgYnVpbGRDTWFrZVByb2plY3RPckV4aXQoJCQkQCkK IAogICAgICRyZXR1cm5Db2RlID0gZXhpdFN0YXR1cyhnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNN YWtlUHJvamVjdCgkcHJlZml4UGF0aCwgQGNtYWtlQXJncykpOwogICAgIGV4aXQoJHJldHVybkNv ZGUpIGlmICRyZXR1cm5Db2RlOworICAgIGV4aXQgMCBpZiBpc05vQnVpbGQoKTsKIAogICAgICRy ZXR1cm5Db2RlID0gZXhpdFN0YXR1cyhidWlsZENNYWtlR2VuZXJhdGVkUHJvamVjdCgkbWFrZUFy Z3MpKTsKICAgICBleGl0KCRyZXR1cm5Db2RlKSBpZiAkcmV0dXJuQ29kZTsKQEAgLTIxNjQsNiAr MjE2NiwxNyBAQCBzdWIgaXNDTWFrZUJ1aWxkKCkKICAgICByZXR1cm4gJGlzQ01ha2VCdWlsZDsK IH0KIAorc3ViIGRldGVybWluZUlzTm9CdWlsZCgpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQo JGlzTm9CdWlsZCk7CisgICAgJGlzTm9CdWlsZCA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVigiLS1uby1idWlsZCIpOworfQorCitzdWIgaXNOb0J1aWxkKCkKK3sKKyAgICByZXR1 cm4gZGV0ZXJtaW5lSXNOb0J1aWxkKCk7Cit9CisKIHN1YiBwcm9tcHRVc2VyCiB7CiAgICAgbXkg KCRwcm9tcHQsICRkZWZhdWx0KSA9IEBfOwo= 315975 2017-07-20 00:22:29 -0700 2017-07-20 23:28:54 -0700 [PATCH] Add '--nobuild' option bug_174664.patch text/plain 3408 Yousuke.Kimoto ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmNzg1 YzAyLi41ZjYyODU2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMDctMTkgIFlvdXN1a2UgS2ltb3RvICA8WW91 c3VrZS5LaW1vdG9Ac29ueS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBBZGQgLS1ub2J1aWxkIG9w dGlvbiB0byBzdG9wIGJ1aWxkIGFmdGVyIGdlbmVyYXRpbmcgcHJvamVjdCBmaWxlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0NjY0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkICctLW5vYnVpbGQn IG9wdGlvbiB0byBzdG9wIGJ1aWxkIGFmdGVyIGdlbmVyYXRpbmcgcHJvamVjdCBmaWxlcworCisg ICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6IEFkZCAnLS1ub2J1aWxkJyBvcHRpb24gYW5k IGEgY2hlY2tlciB0byBzdG9wIGJ1aWxkIGFmdGVyIGdlbmVyYXRpbmcgY29uZmlndXJhaXRvbi4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06IEFkZCBhIGZ1bmN0aW9uIHRvIGNoZWNr ICctLW5vYnVpbGQnIG9wdGlvbiBhbmQgdGhlIHNhbWUgY2hlY2tlciBhcyB0aGUgYWJvdmUKKyAg ICAgICAgKGJ1aWxkQ01ha2VQcm9qZWN0T3JFeGl0KTogQWRkIGEgY2hla2VyIHRvIHN0b3AgYnVp bGQgc3RvcCBidWlsZCBhZnRlciBnZW5lcmF0aW5nIGNvbmZpZ3VyYWl0b24uCisgICAgICAgIChk ZXRlcm1pbmVJc05vQnVpbGQpOiBDaGVjayBpZiAnLS1ub2J1aWxkJyBvcHRpb24gaXMgc3BlY2lm aWVkCisgICAgICAgIChpc05vQnVpbGQpOiBkaXR0bworCiAyMDE3LTA3LTE5ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBsaW50LXRlc3QtZXhwZWN0YXRp b25zIHNob3VsZCBiZSBydW4gZHVyaW5nIHN0eWxlIGNoZWNraW5nCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CmluZGV4 IGE4ZDJjMjYuLjFhM2MzZjcgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0 CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CkBAIC04OSw2ICs4OSw3IEBAIG15ICR1 c2FnZSA9IDw8RU9GOwogVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdG8g cGFzcyB0byBidWlsZCBzeXN0ZW1dCiAgIC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgICAg ICBTaG93IHRoaXMgaGVscCBtZXNzYWdlCiAgIC0tY2xlYW4gICAgICAgICAgICAgICAgICAgICAg ICAgICBDbGVhbnVwIHRoZSBidWlsZCBkaXJlY3RvcnkKKyAgLS1uby1idWlsZCAgICAgICAgICAg ICAgICAgICAgICAgIE9ubHkgZ2VuZXJhdGUgc29sdXRpb24gZmlsZSBvciBidWlsZC5uaW5qYQog ICAtLWRlYnVnICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29tcGlsZSB3aXRoIERlYnVnIGNv bmZpZ3VyYXRpb24KICAgLS1yZWxlYXNlICAgICAgICAgICAgICAgICAgICAgICAgIENvbXBpbGUg d2l0aCBSZWxlYXNlIGNvbmZpZ3VyYXRpb24KICAgLS1zZGs9PHNkaz4gICAgICAgICAgICAgICAg ICAgICAgIFVzZSBhIHNwZWNpZmljIFhjb2RlIFNESyAoaU9TIGFuZCBNYWMgb25seSkKQEAgLTI2 MSw2ICsyNjIsOSBAQCBpZiAoaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSkgewog ICAgIGlmIChleGl0U3RhdHVzKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0KCRw cmVmaXhQYXRoLCBAY21ha2VBcmdzKSkpIHsKICAgICAgICAgZGllICJSdW4gXCJDOi9Qcm9ncmFt IEZpbGVzICh4ODYpL01pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIDE0LjAvVkMvdmN2YXJzYWxsLmJh dFwiIGJlZm9yZSBidWlsZC13ZWJraXQgd2hlbiB1c2luZyBuaW5qYSI7CiAgICAgfQorCisgICAg ZXhpdCAwIGlmIGlzTm9CdWlsZCgpOworCiAgICAgY2hkaXJXZWJLaXQoKTsKICAgICBpZiAoY2Fu VXNlTmluamEoKSkgewogICAgICAgICBjaGRpciBGaWxlOjpTcGVjLT5jYXRkaXIoJGJhc2VQcm9k dWN0RGlyLCBjb25maWd1cmF0aW9uKCkpOwpAQCAtMjc4LDYgKzI4Miw4IEBAIGlmIChpc0FwcGxl V2luV2ViS2l0KCkgfHwgaXNXaW5DYWlybygpKSB7CiAgICAgICAgIGV4aXQgZXhpdFN0YXR1cygk cmVzdWx0KTsKICAgICB9CiB9IGVsc2lmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSAmJiAhaXNDTWFr ZUJ1aWxkKCkpIHsKKyAgICBleGl0IDAgaWYgaXNOb0J1aWxkKCk7CisKICAgICAjIEJ1aWxkLCBh bmQgYWJvcnQgaWYgdGhlIGJ1aWxkIGZhaWxzLgogICAgIGZvciBteSAkZGlyIChAcHJvamVjdHMp IHsKICAgICAgICAgY2hkaXIgJGRpciBvciBkaWU7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggYjJjMzMy MC4uZDFlOGRkNCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTM5LDYgKzEzOSw3IEBAIG15ICRvc1hW ZXJzaW9uOwogbXkgJGlvc1ZlcnNpb247CiBteSAkZ2VuZXJhdGVEc3ltOwogbXkgJGlzQ01ha2VC dWlsZDsKK215ICRpc05vQnVpbGQ7CiBteSAkaXNXaW42NDsKIG15ICRpc0luc3BlY3RvckZyb250 ZW5kOwogbXkgJHBvcnROYW1lOwpAQCAtMjEzNSw2ICsyMTM2LDcgQEAgc3ViIGJ1aWxkQ01ha2VQ cm9qZWN0T3JFeGl0KCQkJEApCiAKICAgICAkcmV0dXJuQ29kZSA9IGV4aXRTdGF0dXMoZ2VuZXJh dGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QoJHByZWZpeFBhdGgsIEBjbWFrZUFyZ3MpKTsK ICAgICBleGl0KCRyZXR1cm5Db2RlKSBpZiAkcmV0dXJuQ29kZTsKKyAgICBleGl0IDAgaWYgaXNO b0J1aWxkKCk7CiAKICAgICAkcmV0dXJuQ29kZSA9IGV4aXRTdGF0dXMoYnVpbGRDTWFrZUdlbmVy YXRlZFByb2plY3QoJG1ha2VBcmdzKSk7CiAgICAgZXhpdCgkcmV0dXJuQ29kZSkgaWYgJHJldHVy bkNvZGU7CkBAIC0yMTY0LDYgKzIxNjYsMTcgQEAgc3ViIGlzQ01ha2VCdWlsZCgpCiAgICAgcmV0 dXJuICRpc0NNYWtlQnVpbGQ7CiB9CiAKK3N1YiBkZXRlcm1pbmVJc05vQnVpbGQoKQoreworICAg IHJldHVybiBpZiBkZWZpbmVkKCRpc05vQnVpbGQpOworICAgICRpc05vQnVpbGQgPSBjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tbm8tYnVpbGQiKTsKK30KKworc3ViIGlzTm9C dWlsZCgpCit7CisgICAgcmV0dXJuIGRldGVybWluZUlzTm9CdWlsZCgpOworfQorCiBzdWIgcHJv bXB0VXNlcgogewogICAgIG15ICgkcHJvbXB0LCAkZGVmYXVsdCkgPSBAXzsK 316073 2017-07-20 23:28:54 -0700 2017-07-21 09:02:25 -0700 [PATCH] Add '--generate-project-only' option bug_174664-2.patch text/plain 3579 Yousuke.Kimoto ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmNzg1 YzAyLi4xYmI5NmI2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMDctMjAgIFlvdXN1a2UgS2ltb3RvICA8WW91 c3VrZS5LaW1vdG9Ac29ueS5jb20+CisKKyAgICAgICAgW0NNYWtlXSBBZGQgYW4gb3B0aW9uIHRv IHN0b3AgYnVpbGQgYWZ0ZXIgZ2VuZXJhdGluZyBwcm9qZWN0IGZpbGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ2NjQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgIi0tZ2VuZXJhdGUtcHJvamVj dC1vbmx5IiB0byBzdG9wIGJ1aWxkIGFmdGVyIGdlbmVyYXRpbmcgcHJvamVjdCBmaWxlcy4KKwor ICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OiBBZGQgJy0tZ2VuZXJhdGUtcHJvamVjdC1v bmx5JyBvcHRpb24gYW5kIGEgY2hlY2tlciB0byBzdG9wIGJ1aWxkLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0ZGlycy5wbTogQWRkIGEgZnVuY3Rpb24gdG8gY2hlY2sgJy0tZ2VuZXJhdGUtcHJv amVjdC1vbmx5JyBvcHRpb24gYW5kIHRoZSBzYW1lIGNoZWNrZXIgYXMgdGhlIGFib3ZlCisgICAg ICAgIChidWlsZENNYWtlUHJvamVjdE9yRXhpdCk6IEFkZCBhIGNoZWtlciB0byBzdG9wIGJ1aWxk IHN0b3AgYnVpbGQgYWZ0ZXIgZ2VuZXJhdGluZyBwcm9qZWN0IGZpbGVzLgorICAgICAgICAoZGV0 ZXJtaW5lSXNHZW5lcmF0ZVByb2plY3RPbmx5KTogQ2hlY2sgaWYgJy0tZ2VuZXJhdGUtcHJvamVj dC1vbmx5JyBvcHRpb24gaXMgc3BlY2lmaWVkCisgICAgICAgIChpc0dlbmVyYXRlUHJvamVjdE9u bHkpOiBkaXR0bworCiAyMDE3LTA3LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl LmNvbT4KIAogICAgICAgICBsaW50LXRlc3QtZXhwZWN0YXRpb25zIHNob3VsZCBiZSBydW4gZHVy aW5nIHN0eWxlIGNoZWNraW5nCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtp dCBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CmluZGV4IGE4ZDJjMjYuLjc2ZTlhODEgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0CkBAIC04OSw2ICs4OSw3IEBAIG15ICR1c2FnZSA9IDw8RU9GOwogVXNhZ2U6 ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdG8gcGFzcyB0byBidWlsZCBzeXN0ZW1d CiAgIC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgICAgICBTaG93IHRoaXMgaGVscCBtZXNz YWdlCiAgIC0tY2xlYW4gICAgICAgICAgICAgICAgICAgICAgICAgICBDbGVhbnVwIHRoZSBidWls ZCBkaXJlY3RvcnkKKyAgLS1nZW5lcmF0ZS1wcm9qZWN0LW9ubHkgICAgICAgICAgIE9ubHkgZ2Vu ZXJhdGUgcHJvamVjdCBmaWxlcwogICAtLWRlYnVnICAgICAgICAgICAgICAgICAgICAgICAgICAg Q29tcGlsZSB3aXRoIERlYnVnIGNvbmZpZ3VyYXRpb24KICAgLS1yZWxlYXNlICAgICAgICAgICAg ICAgICAgICAgICAgIENvbXBpbGUgd2l0aCBSZWxlYXNlIGNvbmZpZ3VyYXRpb24KICAgLS1zZGs9 PHNkaz4gICAgICAgICAgICAgICAgICAgICAgIFVzZSBhIHNwZWNpZmljIFhjb2RlIFNESyAoaU9T IGFuZCBNYWMgb25seSkKQEAgLTI2MSw2ICsyNjIsOSBAQCBpZiAoaXNBcHBsZVdpbldlYktpdCgp IHx8IGlzV2luQ2Fpcm8oKSkgewogICAgIGlmIChleGl0U3RhdHVzKGdlbmVyYXRlQnVpbGRTeXN0 ZW1Gcm9tQ01ha2VQcm9qZWN0KCRwcmVmaXhQYXRoLCBAY21ha2VBcmdzKSkpIHsKICAgICAgICAg ZGllICJSdW4gXCJDOi9Qcm9ncmFtIEZpbGVzICh4ODYpL01pY3Jvc29mdCBWaXN1YWwgU3R1ZGlv IDE0LjAvVkMvdmN2YXJzYWxsLmJhdFwiIGJlZm9yZSBidWlsZC13ZWJraXQgd2hlbiB1c2luZyBu aW5qYSI7CiAgICAgfQorCisgICAgZXhpdCAwIGlmIGlzR2VuZXJhdGVQcm9qZWN0T25seSgpOwor CiAgICAgY2hkaXJXZWJLaXQoKTsKICAgICBpZiAoY2FuVXNlTmluamEoKSkgewogICAgICAgICBj aGRpciBGaWxlOjpTcGVjLT5jYXRkaXIoJGJhc2VQcm9kdWN0RGlyLCBjb25maWd1cmF0aW9uKCkp OwpAQCAtMjc4LDYgKzI4Miw4IEBAIGlmIChpc0FwcGxlV2luV2ViS2l0KCkgfHwgaXNXaW5DYWly bygpKSB7CiAgICAgICAgIGV4aXQgZXhpdFN0YXR1cygkcmVzdWx0KTsKICAgICB9CiB9IGVsc2lm IChpc0FwcGxlQ29jb2FXZWJLaXQoKSAmJiAhaXNDTWFrZUJ1aWxkKCkpIHsKKyAgICBleGl0IDAg aWYgaXNHZW5lcmF0ZVByb2plY3RPbmx5KCk7CisKICAgICAjIEJ1aWxkLCBhbmQgYWJvcnQgaWYg dGhlIGJ1aWxkIGZhaWxzLgogICAgIGZvciBteSAkZGlyIChAcHJvamVjdHMpIHsKICAgICAgICAg Y2hkaXIgJGRpciBvciBkaWU7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggYjJjMzMyMC4uYTQ5ODdhMSAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQpAQCAtMTM5LDYgKzEzOSw3IEBAIG15ICRvc1hWZXJzaW9uOwogbXkg JGlvc1ZlcnNpb247CiBteSAkZ2VuZXJhdGVEc3ltOwogbXkgJGlzQ01ha2VCdWlsZDsKK215ICRp c0dlbmVyYXRlUHJvamVjdE9ubHk7CiBteSAkaXNXaW42NDsKIG15ICRpc0luc3BlY3RvckZyb250 ZW5kOwogbXkgJHBvcnROYW1lOwpAQCAtMjEzNSw2ICsyMTM2LDcgQEAgc3ViIGJ1aWxkQ01ha2VQ cm9qZWN0T3JFeGl0KCQkJEApCiAKICAgICAkcmV0dXJuQ29kZSA9IGV4aXRTdGF0dXMoZ2VuZXJh dGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QoJHByZWZpeFBhdGgsIEBjbWFrZUFyZ3MpKTsK ICAgICBleGl0KCRyZXR1cm5Db2RlKSBpZiAkcmV0dXJuQ29kZTsKKyAgICBleGl0IDAgaWYgaXNH ZW5lcmF0ZVByb2plY3RPbmx5KCk7CiAKICAgICAkcmV0dXJuQ29kZSA9IGV4aXRTdGF0dXMoYnVp bGRDTWFrZUdlbmVyYXRlZFByb2plY3QoJG1ha2VBcmdzKSk7CiAgICAgZXhpdCgkcmV0dXJuQ29k ZSkgaWYgJHJldHVybkNvZGU7CkBAIC0yMTY0LDYgKzIxNjYsMTggQEAgc3ViIGlzQ01ha2VCdWls ZCgpCiAgICAgcmV0dXJuICRpc0NNYWtlQnVpbGQ7CiB9CiAKK3N1YiBkZXRlcm1pbmVJc0dlbmVy YXRlUHJvamVjdE9ubHkoKQoreworICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0dlbmVyYXRlUHJv amVjdE9ubHkpOworICAgICRpc0dlbmVyYXRlUHJvamVjdE9ubHkgPSBjaGVja0ZvckFyZ3VtZW50 QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZ2VuZXJhdGUtcHJvamVjdC1vbmx5Iik7Cit9CisKK3N1YiBp c0dlbmVyYXRlUHJvamVjdE9ubHkoKQoreworICAgIGRldGVybWluZUlzR2VuZXJhdGVQcm9qZWN0 T25seSgpOworICAgIHJldHVybiAkaXNHZW5lcmF0ZVByb2plY3RPbmx5OworfQorCiBzdWIgcHJv bXB0VXNlcgogewogICAgIG15ICgkcHJvbXB0LCAkZGVmYXVsdCkgPSBAXzsK