174195 2017-07-05 21:54:13 -0700 Upgrade MSVC to 2017 2020-06-01 14:57:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 172412 P2 Normal --- 174715 1 ysuzuki ysuzuki achristensen bfulgham don.olmstead fujii mjs oldest_to_newest 1325935 0 ysuzuki 2017-07-05 21:54:13 -0700 In r219186, GCC requirement is bumped to 5.0.0 at least. It allows us to use full-feature of C++14 including relaxed-constexpr. If we can upgrade MSVC to 2017, then WebKit can use relaxed-constexpr in the tree. 1325936 1 ysuzuki 2017-07-05 21:55:20 -0700 (In reply to Yusuke Suzuki from comment #0) > In r219186, GCC requirement is bumped to 5.0.0 at least. > It allows us to use full-feature of C++14 including relaxed-constexpr. > > If we can upgrade MSVC to 2017, then WebKit can use relaxed-constexpr in the > tree. Compared to GCC version, upgrading MSVC version aggressively does not cause problems I think. In the case of GCC, upgrading GCC becomes a bit conservative due to toolchains used in embedded environment. But, in the case of MSVC, basically it is only used in Windows. 1325950 2 314698 ysuzuki 2017-07-05 23:18:24 -0700 Created attachment 314698 Patch 1326058 3 achristensen 2017-07-06 09:32:56 -0700 Cool! We will have to upgrade some internal infrastructure before doing this. 1326528 4 314698 don.olmstead 2017-07-07 11:17:15 -0700 Comment on attachment 314698 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314698&action=review > Tools/EWSTools/start-queue-win.sh:15 > + "$PROGRAMFILES/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" For our bot we use Visual Studio Build Tools 2017 https://channel9.msdn.com/Events/Visual-Studio/Visual-Studio-2017-Launch/T127 since there's no reason for a full install of VS for a build machine. > Tools/Scripts/build-webkit:262 > + die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 15.0/VC/vcvarsall.bat\" before build-webkit when using ninja"; 2017 let's you install wherever you like and have multiple instances of VS https://blogs.msdn.microsoft.com/vcblog/2017/03/06/finding-the-visual-c-compiler-tools-in-visual-studio-2017/ provides info on detecting a applicable tool chain 1331002 5 314698 ysuzuki 2017-07-21 10:17:28 -0700 Comment on attachment 314698 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314698&action=review >> Tools/EWSTools/start-queue-win.sh:15 >> + "$PROGRAMFILES/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" > > For our bot we use Visual Studio Build Tools 2017 https://channel9.msdn.com/Events/Visual-Studio/Visual-Studio-2017-Launch/T127 since there's no reason for a full install of VS for a build machine. That sounds very cool! Do you have any information about the directory structure of this Visual Studio Build Tools 2017? >> Tools/Scripts/build-webkit:262 >> + die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 15.0/VC/vcvarsall.bat\" before build-webkit when using ninja"; > > 2017 let's you install wherever you like and have multiple instances of VS https://blogs.msdn.microsoft.com/vcblog/2017/03/06/finding-the-visual-c-compiler-tools-in-visual-studio-2017/ provides info on detecting a applicable tool chain Oh, great, I'll look into this. 1338777 6 don.olmstead 2017-08-15 12:01:43 -0700 We have https://bugs.webkit.org/show_bug.cgi?id=175279 outstanding. At that point we could create a script that gets the location of the installed Visual Studio 2017 instance. 1379001 7 don.olmstead 2017-12-06 20:08:37 -0800 *** This bug has been marked as a duplicate of bug 172412 *** 1658073 8 314698 mjs 2020-06-01 14:57:13 -0700 Comment on attachment 314698 Patch Unflagging and obsoleting patch, since this bug has been resolved as a duplicate. 314698 2017-07-05 23:18:24 -0700 2020-06-01 14:57:13 -0700 Patch bug-174195-20170706151823.patch text/plain 8378 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIxNDIxZDBlNmI1MDY1NzkzNGEzMTli NzdmZjM3NTUxMzAxOGI5MWQuLjFmNmIxZTNjYzUyNTI0YjQ0OTdhOTFhODdhY2IxODYzYjQ1MzM1 OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTctMDctMDUgIFl1c3VrZSBTdXp1a2kgIDx1dGF0 YW5lLnRlYUBnbWFpbC5jb20+CiAKKyAgICAgICAgVXBncmFkZSBNU1ZDIHRvIDIwMTcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDE5NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL0NvbXBpbGVy Lmg6CisKKzIwMTctMDctMDUgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+ CisKICAgICAgICAgVXBncmFkZSBHQ0MgYmFzZWxpbmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDE1NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RG L3d0Zi9Db21waWxlci5oIGIvU291cmNlL1dURi93dGYvQ29tcGlsZXIuaAppbmRleCBmNjA4Yjg4 MGM1NzZkNmVkNDdkMTkyOGU4YzM0ZWIyNjJhNTAwMjVkLi44YmM1YWZiOTQ3ZmIwMDZmOGRmZDFl MzZmMzhmMDkxZmJlMzE5OTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Db21waWxlci5o CisrKyBiL1NvdXJjZS9XVEYvd3RmL0NvbXBpbGVyLmgKQEAgLTEyOCw4ICsxMjgsOCBAQAogI2Rl ZmluZSBXVEZfQ09NUElMRVJfTVNWQyAxCiAjZGVmaW5lIFdURl9DT01QSUxFUl9TVVBQT1JUU19D WFhfUkVGRVJFTkNFX1FVQUxJRklFRF9GVU5DVElPTlMgMQogCi0jaWYgX01TQ19WRVIgPCAxOTAw Ci0jZXJyb3IgIlBsZWFzZSB1c2UgYSBuZXdlciB2ZXJzaW9uIG9mIFZpc3VhbCBTdHVkaW8uIFdl YktpdCByZXF1aXJlcyBWUzIwMTUgb3IgbmV3ZXIgdG8gY29tcGlsZS4iCisjaWYgX01TQ19WRVIg PCAxOTEwCisjZXJyb3IgIlBsZWFzZSB1c2UgYSBuZXdlciB2ZXJzaW9uIG9mIFZpc3VhbCBTdHVk aW8uIFdlYktpdCByZXF1aXJlcyBWUzIwMTcgb3IgbmV3ZXIgdG8gY29tcGlsZS4iCiAjZW5kaWYK IAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UgYi9T b3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKaW5kZXggMmJmZjhkY2NhMzZhOTdlOWY2ZWYx OTBhZThhMjVmMzljYzlmYjY0MC4uZjM4M2Q0MjZkMGY3Zjk5NzA0MGJlMjQxY2MyYTdjZmMzNDMy MTIxYSAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNNU1ZDLmNtYWtlCisrKyBiL1Nv dXJjZS9jbWFrZS9PcHRpb25zTVNWQy5jbWFrZQpAQCAtODcsMTEgKzg3LDYgQEAgc3RyaW5nKFJF UExBQ0UgIklOQ1JFTUVOVEFMOllFUyIgIklOQ1JFTUVOVEFMOk5PIiByZXBsYWNlX0NNQUtFX0VY RV9MSU5LRVJfRkxBR1MKIHNldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZP ICIke3JlcGxhY2VfQ01BS0VfRVhFX0xJTktFUl9GTEFHU19SRUxXSVRIREVCSU5GT30gL0lOQ1JF TUVOVEFMOk5PIikKIAogaWYgKENPTVBJTEVSX0lTX0NMQU5HX0NMKQotICAgICMgRklYTUU6IFdl IG5lZWQgdG8gc2V0IHRoZSBtc2MtdmVyc2lvbiBhYm92ZSB0aGUgb25lIGl0IGRlZmF1bHRzIHRv Ci0gICAgIyB3aGVuIHVzaW5nIGNsYW5nLWNsIHdpdGggVlMyMDE1LiBUaGlzIG1pZ2h0IGJlIHVu bmVjZXNzYXJ5IHdoZW4gbW92aW5nIHRvCi0gICAgIyBWUzIwMTcgYXMgcGFydCBvZiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyNDEyCi0gICAgYWRkX2NvbXBpbGVf b3B0aW9ucygtZm1zYy12ZXJzaW9uPTE5MDAyMzkxOCkKLQogICAgICMgRklYTUU6IEJ1aWxkaW5n IHdpdGggY2xhbmctY2wgc2VlbWVkIHRvIGZhaWwgd2l0aCAxMjggYml0IGludCBzdXBwb3J0CiAg ICAgc2V0KEhBVkVfSU5UMTI4X1QgT0ZGKQogICAgIGxpc3QoUkVNT1ZFX0lURU0gX1dFQktJVF9D T05GSUdfRklMRV9WQVJJQUJMRVMgSEFWRV9JTlQxMjhfVCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNzhiMGM3ZGFiMzc2MGMxYzI3NmU0ZGRj ZTdjNzFhMDRjZTA3ZDg2Li4xNjczMjRmMTc1MzIxNjkyMDk4ZjdhNTNkMGQ0M2Q2MjllMjcxNWEy IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTctMDctMDUgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFp bC5jb20+CisKKyAgICAgICAgVXBncmFkZSBNU1ZDIHRvIDIwMTcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDE5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRVdTVG9vbHMvc3RhcnQtcXVldWUtd2lu LnNoOgorICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKyAgICAgICAgKHZpc3VhbFN0dWRpb0luc3RhbGxEaXIpOgorICAgICAg ICAodmlzdWFsU3R1ZGlvVmVyc2lvbik6CisgICAgICAgIChzZXR1cEFwcGxlV2luRW52KToKKyAg ICAgICAgKHNldHVwQ3lnd2luRW52KToKKyAgICAgICAgKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9t Q01ha2VQcm9qZWN0KToKKwogMjAxNy0wNy0wNSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxl LmNvbT4KIAogICAgICAgICBOZXdBcnJheSBpbiBGVExMb3dlckRGR1RvQjMgZG9lcyBub3QgaGFu ZGxlIHNwZWN1bGF0aW5nIG9uIGRvdWJsZXMgd2hlbiBoYXZpbmcgYSBiYWQgdGltZQpkaWZmIC0t Z2l0IGEvVG9vbHMvRVdTVG9vbHMvc3RhcnQtcXVldWUtd2luLnNoIGIvVG9vbHMvRVdTVG9vbHMv c3RhcnQtcXVldWUtd2luLnNoCmluZGV4IDM1MDJmM2QzYjM3YmNiYTdiYzAyN2Q3MjE1YjFjZDIw ZWMwYzVhZTAuLjUzYzNmNTY1MTIwZDc1NWQ4ZGY1OWZlY2Q4M2MzY2FkMmFjNjMxM2MgMTAwNzU1 Ci0tLSBhL1Rvb2xzL0VXU1Rvb2xzL3N0YXJ0LXF1ZXVlLXdpbi5zaAorKysgYi9Ub29scy9FV1NU b29scy9zdGFydC1xdWV1ZS13aW4uc2gKQEAgLTEyLDcgKzEyLDcgQEAgZnVuY3Rpb24gc3RhcnRf ZXdzKCkKIHsKICAgICB0cmFwICdlcnJvcl9oYW5kbGVyICR7TElORU5PfSAkPycgRVJSCiAKLSAg ICAiJFBST0dSQU1GSUxFUy9NaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyAxNC4wL1ZDL3ZjdmFyc2Fs bC5iYXQiCisgICAgIiRQUk9HUkFNRklMRVMvTWljcm9zb2Z0IFZpc3VhbCBTdHVkaW8vMjAxNy9D b21tdW5pdHkvVkMvQXV4aWxpYXJ5L0J1aWxkL3ZjdmFyc2FsbC5iYXQiCiAKICAgICB3aGlsZSA6 CiAgICAgZG8KQEAgLTI0LDcgKzI0LDcgQEAgZnVuY3Rpb24gc3RhcnRfZXdzKCkKICAgICAgICAg ZmluZCB+L3dpbi1ld3MtbG9ncyAtbXRpbWUgKzcgLWV4ZWMgcm0gLWYge30gXDsKICAgICAgICAg ZWNobyAiVEFTSzogU3RhcnRpbmcgdXAiCiAgICAgICAgIGNkIH4vV2ViS2l0Ci0gICAgICAgIGV4 cG9ydCBWU0lOU1RBTExESVI9IiRQUk9HUkFNRklMRVNcTWljcm9zb2Z0IFZpc3VhbCBTdHVkaW8g MTQuMCIKKyAgICAgICAgZXhwb3J0IFZTSU5TVEFMTERJUj0iJFBST0dSQU1GSUxFU1xNaWNyb3Nv ZnQgVmlzdWFsIFN0dWRpbyAxNS4wIgogICAgICAgICBlY2hvICJUQVNLOiBDbGVhbmluZyBXZWJL aXRCdWlsZCIKICAgICAgICAgcm0gLXJmIFdlYktpdEJ1aWxkCiAgICAgICAgIGRhdGUKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQKaW5kZXggZGFkNzkwZmYwMTJjYTU4YjNjYmU2NmY0YzRmMzg3NDZhMTkwZDM0MC4uMTM1 MjU3NzFhZTNjMmUyYWMwNGVjMWMxY2IxOTAwOTliZTEyZjk4ZCAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAg LTI1OSw3ICsyNTksNyBAQCBpZiAoaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSkg ewogCiAgICAgY2hkaXJXZWJLaXQoKTsKICAgICBpZiAoZXhpdFN0YXR1cyhnZW5lcmF0ZUJ1aWxk U3lzdGVtRnJvbUNNYWtlUHJvamVjdCgkcHJlZml4UGF0aCwgQGNtYWtlQXJncykpKSB7Ci0gICAg ICAgIGRpZSAiUnVuIFwiQzovUHJvZ3JhbSBGaWxlcyAoeDg2KS9NaWNyb3NvZnQgVmlzdWFsIFN0 dWRpbyAxNC4wL1ZDL3ZjdmFyc2FsbC5iYXRcIiBiZWZvcmUgYnVpbGQtd2Via2l0IHdoZW4gdXNp bmcgbmluamEiOworICAgICAgICBkaWUgIlJ1biBcIkM6L1Byb2dyYW0gRmlsZXMgKHg4NikvTWlj cm9zb2Z0IFZpc3VhbCBTdHVkaW8gMTUuMC9WQy92Y3ZhcnNhbGwuYmF0XCIgYmVmb3JlIGJ1aWxk LXdlYmtpdCB3aGVuIHVzaW5nIG5pbmphIjsKICAgICB9CiAgICAgY2hkaXJXZWJLaXQoKTsKICAg ICBpZiAoY2FuVXNlTmluamEoKSkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGIyYzMzMjBiMjQ5OWNi NzVkYWQ3Mjg2OWM4M2MzOTExN2ZmZjcyMDguLjk0NDlmYzEyNjQ0YTQyN2QzZTRhNWI5ZTJhMTc0 ZDgzNDQwMWUzNmQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTU3MSw3ICs1NzEsNyBAQCBzdWIgdmlz dWFsU3R1ZGlvSW5zdGFsbERpcgogICAgICAgICAkdnNJbnN0YWxsRGlyID0gJEVOVnsnVlNJTlNU QUxMRElSJ307CiAgICAgICAgICR2c0luc3RhbGxEaXIgPX4gc3xbXFwvXSR8fDsKICAgICB9IGVs c2UgewotICAgICAgICAkdnNJbnN0YWxsRGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKHByb2dyYW1G aWxlc1BhdGgoKSwgIk1pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIDE0LjAiKTsKKyAgICAgICAgJHZz SW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcihwcm9ncmFtRmlsZXNQYXRoKCksICJNaWNy b3NvZnQgVmlzdWFsIFN0dWRpbyAxNS4wIik7CiAgICAgfQogICAgIGNob21wKCR2c0luc3RhbGxE aXIgPSBgY3lncGF0aCAiJHZzSW5zdGFsbERpciJgKSBpZiBpc0N5Z3dpbigpOwogCkBAIC01OTcs NyArNTk3LDcgQEAgc3ViIHZpc3VhbFN0dWRpb1ZlcnNpb24KIAogICAgIG15ICRpbnN0YWxsRGly ID0gdmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOwogCi0gICAgJHZzVmVyc2lvbiA9ICgkaW5zdGFs bERpciA9fiAvTWljcm9zb2Z0IFZpc3VhbCBTdHVkaW8gKFswLTldK1wuWzAtOV0qKS8pID8gJDEg OiAiMTQiOworICAgICR2c1ZlcnNpb24gPSAoJGluc3RhbGxEaXIgPX4gL01pY3Jvc29mdCBWaXN1 YWwgU3R1ZGlvIChbMC05XStcLlswLTldKikvKSA/ICQxIDogIjE1IjsKIAogICAgIHByaW50ICJV c2luZyBWaXN1YWwgU3R1ZGlvICR2c1ZlcnNpb25cbiI7CiAgICAgcmV0dXJuICR2c1ZlcnNpb247 CkBAIC0xNjg4LDEzICsxNjg4LDEzIEBAICgpCiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKCFk ZWZpbmVkICRFTlZ7J1dFQktJVF9MSUJSQVJJRVMnfSB8fCAhJEVOVnsnV0VCS0lUX0xJQlJBUklF Uyd9KSB7CiAgICAgICAgICAgICBwcmludCAiV2FybmluZzogWW91IG11c3Qgc2V0IHRoZSAnV2Vi S2l0X0xpYnJhcmllcycgZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7Ci0gICAgICAgICAgICBwcmlu dCAiICAgICAgICAgdG8gYmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0 dWRpbyAyMDEzIGFuZCBuZXdlci5cbiI7CisgICAgICAgICAgICBwcmludCAiICAgICAgICAgdG8g YmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRpbyAyMDE3IGFuZCBu ZXdlci5cbiI7CiAgICAgICAgICAgICBwcmludCAiICAgICAgICAgTWFrZSBzdXJlIHRoYXQgJ1dl YktpdF9MaWJyYXJpZXMnIHBvaW50cyB0byB0aGVcbiI7CiAgICAgICAgICAgICBwcmludCAiICAg ICAgICAgJ1dlYktpdExpYnJhcmllcy93aW4nIGRpcmVjdG9yeSwgbm90IHRoZSAnV2ViS2l0TGli cmFyaWVzLycgZGlyZWN0b3J5LlxuXG4iOwogICAgICAgICB9CiAgICAgICAgIGlmICghZGVmaW5l ZCAkRU5WeydXRUJLSVRfT1VUUFVURElSJ30gfHwgISRFTlZ7J1dFQktJVF9PVVRQVVRESVInfSkg ewogICAgICAgICAgICAgcHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0IHNldCB0aGUgJ1dlYktpdF9P dXRwdXREaXInIGVudmlyb25tZW50IHZhcmlhYmxlXG4iOwotICAgICAgICAgICAgcHJpbnQgIiAg ICAgICAgIHRvIGJlIGFibGUgYnVpbGQgV2ViS2l0IGZyb20gd2l0aGluIFZpc3VhbCBTdHVkaW8g MjAxMyBhbmQgbmV3ZXIuXG5cbiI7CisgICAgICAgICAgICBwcmludCAiICAgICAgICAgdG8gYmUg YWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRpbyAyMDE3IGFuZCBuZXdl ci5cblxuIjsKICAgICAgICAgfQogICAgICAgICBpZiAoIWRlZmluZWQgJEVOVnsnTVNCVUlMRERJ U0FCTEVOT0RFUkVVU0UnfSB8fCAhJEVOVnsnTVNCVUlMRERJU0FCTEVOT0RFUkVVU0UnfSkgewog ICAgICAgICAgICAgcHJpbnQgIldhcm5pbmc6IFlvdSBzaG91bGQgc2V0IHRoZSAnTVNCVUlMRERJ U0FCTEVOT0RFUkVVU0UnIGVudmlyb25tZW50IHZhcmlhYmxlIHRvICcxJ1xuIjsKQEAgLTE3Mjcs NyArMTcyNyw3IEBAICgpCiAgICAgICAgICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsKICAgICAgICAgICAg IHByaW50ICJDYW5ub3QgZmluZCAnJHZpc3VhbFN0dWRpb1BhdGgnXG4iOwogICAgICAgICAgICAg cHJpbnQgIlBsZWFzZSBleGVjdXRlIHRoZSBmaWxlICd2Y3ZhcnMzMi5iYXQnIGZyb21cbiI7Ci0g ICAgICAgICAgICBwcmludCAiJyRwcm9ncmFtRmlsZXNQYXRoXFxNaWNyb3NvZnQgVmlzdWFsIFN0 dWRpbyAxNC4wXFxWQ1xcYmluXFwnXG4iOworICAgICAgICAgICAgcHJpbnQgIickcHJvZ3JhbUZp bGVzUGF0aFxcTWljcm9zb2Z0IFZpc3VhbCBTdHVkaW8gMTUuMFxcVkNcXGJpblxcJ1xuIjsKICAg ICAgICAgICAgIHByaW50ICJ0byBzZXR1cCB0aGUgbmVjZXNzYXJ5IGVudmlyb25tZW50IHZhcmlh Ymxlcy5cbiI7CiAgICAgICAgICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsKICAgICAgICAgICAgIGRpZTsK QEAgLTIwNDYsNyArMjA0Niw3IEBAIHN1YiBnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJv amVjdAogICAgICAgICAgICAgcHVzaCBAYXJncywgIk5pbmphIjsKICAgICAgICAgfQogICAgIH0g ZWxzaWYgKGlzQW55V2luZG93cygpICYmIGlzV2luNjQoKSkgewotICAgICAgICBwdXNoIEBhcmdz LCAnLUcgIlZpc3VhbCBTdHVkaW8gMTQgMjAxNSBXaW42NCInOworICAgICAgICBwdXNoIEBhcmdz LCAnLUcgIlZpc3VhbCBTdHVkaW8gMTUgMjAxNyBXaW42NCInOwogICAgIH0KICAgICAjIERvIG5v dCBzaG93IHByb2dyZXNzIG9mIGdlbmVyYXRpbmcgYmluZGluZ3MgaW4gaW50ZXJhY3RpdmUgTmlu amEgYnVpbGQgbm90IHRvIGxlYXZlIG5vaXN5IGxpbmVzIG9uIHR0eQogICAgIHB1c2ggQGFyZ3Ms ICctRFNIT1dfQklORElOR1NfR0VORVJBVElPTl9QUk9HUkVTUz0xJyB1bmxlc3MgKCR3aWxsVXNl TmluamEgJiYgLXQgU1RET1VUKTsKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwpp bmRleCAzY2M3YjUxNmRiYzEzY2Y2ZjNlOWI4NWE3N2RkNjVmZTBjMjE0Nzk5Li43NzI5OTJlNTFj YWI1ODZhZmNhYWU1NTgxOGI4MWZiNWYwOTQ0NmE1IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysr IGIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTctMDctMDUgIFl1c3VrZSBTdXp1a2kg IDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKKyAgICAgICAgVXBncmFkZSBNU1ZDIHRvIDIwMTcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDE5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNl L2NtYWtlL09wdGlvbnNNU1ZDLmNtYWtlOgorCisyMDE3LTA3LTA1ICBZdXN1a2UgU3V6dWtpICA8 dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCiAgICAgICAgIFVwZ3JhZGUgR0NDIGJhc2VsaW5lCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQxNTUKIAo=