136377 2014-08-29 11:42:16 -0700 [Gtk] build.sh needs a -- before make options when the build command is cmake --build 2014-09-25 08:22:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 b.long b.long b.long cgarcia commit-queue dbates gyuyoung.kim mrobinson ossy pnormand rakuco ryuan.choi sergio oldest_to_newest 1032212 0 b.long 2014-08-29 11:42:16 -0700 [Gtk] build.sh needs a -- before make options when the build command is cmake --build 1032213 1 237364 b.long 2014-08-29 11:43:26 -0700 Created attachment 237364 Patch 1032214 2 b.long 2014-08-29 11:44:01 -0700 This is needed on Arch Linux. 1032613 3 b.long 2014-09-02 07:58:39 -0700 Can you take a look at this patch too (or suggest someone else if you don't usually review build system patches)? 1032615 4 237364 pnormand 2014-09-02 08:01:22 -0700 Comment on attachment 237364 Patch Why is this patch needed? Do you need to pass specific options to make? 1032616 5 237364 mrobinson 2014-09-02 08:01:55 -0700 Comment on attachment 237364 Patch This looks like a fix that should be submitted upstream to CMake instead of to WebKit. Why does this only fail for Arch? 1032622 6 b.long 2014-09-02 08:23:03 -0700 (In reply to comment #4) > (From update of attachment 237364 [details]) > Why is this patch needed? Do you need to pass specific options to make? webkit-build automatically passes -j8 (or something similar) to the build command. Specifically, on Arch Linux, build.sh looks like this: #!/bin/sh /usr/bin/cmake --build . --config "Release" $@ And $@ is -j8. "cmake --build . --config "Release" -j8" is invalid and gives this error: Unknown argument -j8 Usage: cmake --build <dir> [options] [-- [native-options]] (In reply to comment #5) > (From update of attachment 237364 [details]) > This looks like a fix that should be submitted upstream to CMake instead of to WebKit. Why does this only fail for Arch? The difference between Fedora 20 and Arch seems to be that Arch is using CMake 3.0 and Fedora is using CMake 2.8. http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html#other-changes > The build_command() command now returns a cmake(1) --build command line instead of a direct invocation of the native build tool. This is a WebKit issue because we're calling cmake --build incorrectly. Expecting this to work correctly on two different major versions may be unreasonable, but this was the only change I needed to make to make it work. For reading the documentation, it looks like sometimes the build command will already include -- though, so I'll update my patch to check for that: http://www.cmake.org/cmake/help/v3.0/command/build_command.html#command:build_command 1032649 7 237492 b.long 2014-09-02 09:13:27 -0700 Created attachment 237492 Patch 1032655 8 237492 mrobinson 2014-09-02 09:31:34 -0700 Comment on attachment 237492 Patch I feel like we tried pretty hard to get the actual build command into the build.sh script. If CMake 3.0 no longer lets us do that, we may need to find another work-around. I cannot recall exactly why it was important that we invoked the build system directly, instead of using "cmake --build." 1032662 9 b.long 2014-09-02 09:38:20 -0700 Fedora 21 is going to ship with CMake 3.0: https://apps.fedoraproject.org/packages/cmake The next version of Ubuntu doesn't have it yet, so we might be stuck with both for a little while: http://packages.ubuntu.com/search?keywords=cmake https://packages.debian.org/search?keywords=cmake 1032668 10 b.long 2014-09-02 09:49:49 -0700 (In reply to comment #8) > (From update of attachment 237492 [details]) > I feel like we tried pretty hard to get the actual build command into the build.sh script. If CMake 3.0 no longer lets us do that, we may need to find another work-around. I cannot recall exactly why it was important that we invoked the build system directly, instead of using "cmake --build." I'm not sure if it's possible to get the real build command anymore.. 1032676 11 mrobinson 2014-09-02 10:02:41 -0700 (In reply to comment #10) > I'm not sure if it's possible to get the real build command anymore.. That's really unfortunate. We might have to resort to just creating the command-line manually. :/ 1034593 12 ossy 2014-09-11 06:09:14 -0700 (In reply to comment #8) > (From update of attachment 237492 [details]) > I feel like we tried pretty hard to get the actual build command into the build.sh script. If CMake 3.0 no longer lets us do that, we may need to find another work-around. I cannot recall exactly why it was important that we invoked the build system directly, instead of using "cmake --build." I think you meant bug130076 1034602 13 mrobinson 2014-09-11 07:49:52 -0700 (In reply to comment #12) > (In reply to comment #8) > > (From update of attachment 237492 [details] [details]) > > I feel like we tried pretty hard to get the actual build command into the build.sh script. If CMake 3.0 no longer lets us do that, we may need to find another work-around. I cannot recall exactly why it was important that we invoked the build system directly, instead of using "cmake --build." > > I think you meant bug130076 Perhaps the original bug is now fixed in the later versions of CMake? 1035500 14 mrobinson 2014-09-16 10:30:24 -0700 I think the answer here is that if build.sh is simply calling cmake --build, then we should just not use build.sh for CMake 3. 1035510 15 b.long 2014-09-16 11:16:27 -0700 (In reply to comment #14) > I think the answer here is that if build.sh is simply calling cmake --build, then we should just not use build.sh for CMake 3. I'm kind of busy with other things at the moment, so if someone else wants to write a patch to do that it would be fine with me. 1037176 16 238648 cgarcia 2014-09-25 01:26:50 -0700 Created attachment 238648 Another approach Martin is right, we don't need the build.sh hack at all with CMake 3. 1037177 17 238648 pnormand 2014-09-25 01:31:10 -0700 Comment on attachment 238648 Another approach Nice, thanks! 1037179 18 cgarcia 2014-09-25 01:44:32 -0700 A clean build will be needed, or at least the build.sh script should be removed from the build dir. 1037226 19 238648 commit-queue 2014-09-25 07:45:29 -0700 Comment on attachment 238648 Another approach Clearing flags on attachment: 238648 Committed r173964: <http://trac.webkit.org/changeset/173964> 1037230 20 b.long 2014-09-25 08:22:39 -0700 Thanks for handling this! 237364 2014-08-29 11:43:26 -0700 2014-09-02 09:13:23 -0700 Patch bug-136377-20140829184319.patch text/plain 1443 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDM3N2I4 MTkyZmIxOTc1ZjdmOGUzMGMyMTEzOWE2OWM0Yjg0NDJiOGUuLjVkOTdmMzUyNTIzNzdjYzRhMTIw MDIyYjcwZWJmMzFiYWFhZWZkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zNzAsNiArMzcw LDcgQEAgYnVpbGRfY29tbWFuZChDT01NQU5EX0xJTkVfVE9fQlVJTEQpCiAjIHRoZSBzYW1lIGVm ZmVjdCwgZXhjZXB0IHRoYXQgdGhlIHJldHVybiBjb2RlIHdpbGwgaW5kaWNhdGUgdGhhdCBhbiBl cnJvciBvY2N1cnJlZC4KICMgU2VlOiBodHRwOi8vd3d3LmNtYWtlLm9yZy9jbWFrZS9oZWxwL3Yz LjAvY29tbWFuZC9idWlsZF9jb21tYW5kLmh0bWwKIHN0cmluZyhSRVBMQUNFICIgLWkiICIgLWsi IENPTU1BTkRfTElORV9UT19CVUlMRCAke0NPTU1BTkRfTElORV9UT19CVUlMRH0pCitzdHJpbmco UkVHRVggUkVQTEFDRSAiY21ha2UgLS1idWlsZCguKikiICJjbWFrZSAtLWJ1aWxkXFwxIC0tIiBD T01NQU5EX0xJTkVfVE9fQlVJTEQgJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9KQogZmlsZShXUklU RQogICAgICR7Q01BS0VfQklOQVJZX0RJUn0ke0NNQUtFX0ZJTEVTX0RJUkVDVE9SWX0vYnVpbGQu c2gKICAgICAiIyEvYmluL3NoXG4iCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cK aW5kZXggZTM3YThhZmQ0N2ViYzYwOTU4NmVlZWNmNmU3M2ViYjhlNjE2NzBmMy4uMTQyOWJlNzUy OGYzYjAyNWRlZDQxNWZjZjI0MTA0YTk5MDI2OWY0NyAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisr KyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE0LTA4LTI5ICBCcmVuZGFuIExvbmcg IDxzZWxmQGJyZW5kYW5sb25nLmNvbT4KKworICAgICAgICBbR3RrXSBidWlsZC5zaCBuZWVkcyBh IC0tIGJlZm9yZSBtYWtlIG9wdGlvbnMgd2hlbiB0aGUgYnVpbGQgY29tbWFuZCBpcyBjbWFrZSAt LWJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzYzNzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBBZGQgLS0gYmVmb3JlIG1ha2Ugb3B0aW9u cyBpbiBidWlsZC5zaCB3aGVuIGJ1aWxkIGNvbW1hbmQgaXMgY21ha2UgLS1idWlsZC4KKwogMjAx NC0wOC0yOCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAKICAgICAg ICAgV2ViSW5zcGVjdG9yVUkuZnJhbWV3b3JrIGlzIG5vdCBidWlsdCBmb3IgdGhlICJBbGwgU291 cmNlIiBYY29kZSBzY2hlbWUK 237492 2014-09-02 09:13:27 -0700 2014-09-25 08:21:13 -0700 Patch bug-136377-20140902161321.patch text/plain 2144 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDM3N2I4 MTkyZmIxOTc1ZjdmOGUzMGMyMTEzOWE2OWM0Yjg0NDJiOGUuLjgwMTMyMGJjZjc5MmIwY2ZjOWI5 NTRmMTYxYTJmMGM0MDJkYTY2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zNzAsNiArMzcw LDE1IEBAIGJ1aWxkX2NvbW1hbmQoQ09NTUFORF9MSU5FX1RPX0JVSUxEKQogIyB0aGUgc2FtZSBl ZmZlY3QsIGV4Y2VwdCB0aGF0IHRoZSByZXR1cm4gY29kZSB3aWxsIGluZGljYXRlIHRoYXQgYW4g ZXJyb3Igb2NjdXJyZWQuCiAjIFNlZTogaHR0cDovL3d3dy5jbWFrZS5vcmcvY21ha2UvaGVscC92 My4wL2NvbW1hbmQvYnVpbGRfY29tbWFuZC5odG1sCiBzdHJpbmcoUkVQTEFDRSAiIC1pIiAiIC1r IiBDT01NQU5EX0xJTkVfVE9fQlVJTEQgJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9KQorIyBJbiBD TWFrZSAzLjAgYW5kIGhpZ2hlciwgdGhlIGJ1aWxkIGNvbW1hbmQgd2lsbCBhbHdheXMgYmUgY21h a2UgLS1idWlsZCwgYW5kIG1ha2UvbmluamEKKyMgb3B0aW9ucyBuZWVkIHRvIGJlIHBhc3NlZCBs aWtlOgorIyAgICAgY21ha2UgLS1idWlsZCBbb3B0aW9uc10gLS0gW21ha2UvbmluamEgb3B0aW9u c10KKyMgQWRkaXRpb25hbGx5LCB3aGVuIHRoZSBidWlsZCBzeXN0ZW0gaXMgbWFrZSwgdGhlIGNv bW1hbmQgYXV0b21hdGljYWxseSBlbmRzIHdpdGgKKyMgIi0tIC1pIiwgc28gd2UgaGF2ZSB0byBt YWtlIHN1cmUgd2UgZG9uJ3QgYWRkIC0tIHR3aWNlLgorIyBodHRwOi8vd3d3LmNtYWtlLm9yZy9j bWFrZS9oZWxwL3YzLjAvY29tbWFuZC9idWlsZF9jb21tYW5kLmh0bWwKK2lmIChOT1QgJHtDT01N QU5EX0xJTkVfVE9fQlVJTER9IE1BVENIRVMgIiAtLSAiIEFORCAke0NPTU1BTkRfTElORV9UT19C VUlMRH0gTUFUQ0hFUyAiY21ha2UgLS1idWlsZCIpCisgICAgc2V0KENPTU1BTkRfTElORV9UT19C VUlMRCAiJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9IC0tIikKK2VuZGlmICgpCiBmaWxlKFdSSVRF CiAgICAgJHtDTUFLRV9CSU5BUllfRElSfSR7Q01BS0VfRklMRVNfRElSRUNUT1JZfS9idWlsZC5z aAogICAgICIjIS9iaW4vc2hcbiIKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwpp bmRleCBlMzdhOGFmZDQ3ZWJjNjA5NTg2ZWVlY2Y2ZTczZWJiOGU2MTY3MGYzLi4zOGI5ZTQyMzU3 NTZkZjhjZjM1MzliYWE4ZjhmMzgzZGNlNDM3ZDJkIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysr IGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDgtMjkgIEJyZW5kYW4gTG9uZyAg PHNlbGZAYnJlbmRhbmxvbmcuY29tPgorCisgICAgICAgIFtHdGtdIGJ1aWxkLnNoIG5lZWRzIGEg LS0gYmVmb3JlIG1ha2Ugb3B0aW9ucyB3aGVuIHRoZSBidWlsZCBjb21tYW5kIGlzIGNtYWtlIC0t YnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz NjM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgZml4ZXMgYSBwcm9ibGVtIHdpdGggQ01ha2UgMy4wLCB3aGVyZSB0aGUgYnVpbGQgY29tbWFu ZCBpcyBhbHdheXMKKyAgICAgICAgY21ha2UgLS1idWlsZCwgYW5kIGl0IGV4cGVjdHMgbWFrZS9u aW5qYSBhcmd1bWVudHMgdG8gYmUgcGFzc2VkIGFzOgorICAgICAgICBjbWFrZSAtLWJ1aWxkIFtv cHRpb25zXSAtLSBbbWFrZS9uaW5qYSBhcmd1bWVudHNdCisKKyAgICAgICAgKiBTb3VyY2UvY21h a2UvT3B0aW9uc0dUSy5jbWFrZTogQWRkIC0tIGJlZm9yZSBtYWtlIG9wdGlvbnMgaW4gYnVpbGQu c2ggd2hlbiBidWlsZCBjb21tYW5kIGlzIGNtYWtlIC0tYnVpbGQgKGlmIGl0J3Mgbm90IGFscmVh ZHkgdGhlcmUpLgorCiAyMDE0LTA4LTI4ICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5n dG9uLmVkdT4KIAogICAgICAgICBXZWJJbnNwZWN0b3JVSS5mcmFtZXdvcmsgaXMgbm90IGJ1aWx0 IGZvciB0aGUgIkFsbCBTb3VyY2UiIFhjb2RlIHNjaGVtZQo= 238648 2014-09-25 01:26:50 -0700 2014-09-25 07:45:29 -0700 Another approach wk-cmake3.diff text/plain 4060 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBmYmM2NzIzLi4wN2UyYmEw IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTQtMDktMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHdGtdIGJ1aWxkLnNoIG5lZWRzIGEgLS0gYmVmb3JlIG1ha2Ugb3B0aW9ucyB3 aGVuIHRoZSBidWlsZCBjb21tYW5kIGlzIGNtYWtlIC0tYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjM3NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNHVEsu Y21ha2U6IE9ubHkgY3JlYXRlIHRoZSBidWlsZC5zaCBzY3JpcHQKKyAgICAgICAgZm9yIENNYWtl IHZlcnNpb25zIGxlc3MgdGhhbiAzLgorCiAyMDE0LTA5LTI0ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgT3B0 aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi42LjAgcmVsZWFzZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlIGIvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21h a2UKaW5kZXggODI2OWRiNy4uYjI3NWY5ZiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlv bnNHVEsuY21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKQEAgLTM2Miwy MCArMzYyLDI2IEBAIG1hY3JvKEFERF9XSE9MRV9BUkNISVZFX1RPX0xJQlJBUklFUyBfbGlzdF9u YW1lKQogICAgIHNldCgke19saXN0X25hbWV9ICIkeyR7X2xpc3RfbmFtZX1fVE1QfSIpCiBlbmRt YWNybygpCiAKLWJ1aWxkX2NvbW1hbmQoQ09NTUFORF9MSU5FX1RPX0JVSUxEKQotIyBidWlsZF9j b21tYW5kIHVuY29uZGl0aW9uYWxseSBhZGRzIC1pIChpZ25vcmUgZXJyb3JzKSBmb3IgbWFrZSwg YW5kIHRoZXJlJ3MKLSMgbm8gcmVhc29uYWJsZSB3YXkgdG8gdHVybiB0aGF0IG9mZiwgc28gd2Ug anVzdCByZXBsYWNlIGl0IHdpdGggLWssIHdoaWNoIGhhcwotIyB0aGUgc2FtZSBlZmZlY3QsIGV4 Y2VwdCB0aGF0IHRoZSByZXR1cm4gY29kZSB3aWxsIGluZGljYXRlIHRoYXQgYW4gZXJyb3Igb2Nj dXJyZWQuCi0jIFNlZTogaHR0cDovL3d3dy5jbWFrZS5vcmcvY21ha2UvaGVscC92My4wL2NvbW1h bmQvYnVpbGRfY29tbWFuZC5odG1sCi1zdHJpbmcoUkVQTEFDRSAiIC1pIiAiIC1rIiBDT01NQU5E X0xJTkVfVE9fQlVJTEQgJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9KQotZmlsZShXUklURQotICAg ICR7Q01BS0VfQklOQVJZX0RJUn0ke0NNQUtFX0ZJTEVTX0RJUkVDVE9SWX0vYnVpbGQuc2gKLSAg ICAiIyEvYmluL3NoXG4iCi0gICAgIiR7Q09NTUFORF9MSU5FX1RPX0JVSUxEfSAkQCIKLSkKLWZp bGUoQ09QWSAke0NNQUtFX0JJTkFSWV9ESVJ9JHtDTUFLRV9GSUxFU19ESVJFQ1RPUll9L2J1aWxk LnNoCi0gIERFU1RJTkFUSU9OICR7Q01BS0VfQklOQVJZX0RJUn0KLSAgRklMRV9QRVJNSVNTSU9O UyBPV05FUl9SRUFEIE9XTkVSX1dSSVRFIE9XTkVSX0VYRUNVVEUgR1JPVVBfUkVBRCBHUk9VUF9F WEVDVVRFKQoraWYgKENNQUtFX01BSk9SX1ZFUlNJT04gTEVTUyAzKQorICAgICMgQmVmb3JlIENN YWtlIDMgaXQgd2FzIG5lY2Vzc2FyeSB0byB1c2UgYSBidWlsZCBzY3JpcHQgaW5zdGVhZCBvZiB1 c2luZyBjbWFrZSAtLWJ1aWxkIGRpcmVjdGx5CisgICAgIyB0byBwcmVzZXJ2ZSBjb2xvcnMgYW5k IHByZXR0eS1wcmludGluZy4KKworICAgIGJ1aWxkX2NvbW1hbmQoQ09NTUFORF9MSU5FX1RPX0JV SUxEKQorICAgICMgYnVpbGRfY29tbWFuZCB1bmNvbmRpdGlvbmFsbHkgYWRkcyAtaSAoaWdub3Jl IGVycm9ycykgZm9yIG1ha2UsIGFuZCB0aGVyZSdzCisgICAgIyBubyByZWFzb25hYmxlIHdheSB0 byB0dXJuIHRoYXQgb2ZmLCBzbyB3ZSBqdXN0IHJlcGxhY2UgaXQgd2l0aCAtaywgd2hpY2ggaGFz CisgICAgIyB0aGUgc2FtZSBlZmZlY3QsIGV4Y2VwdCB0aGF0IHRoZSByZXR1cm4gY29kZSB3aWxs IGluZGljYXRlIHRoYXQgYW4gZXJyb3Igb2NjdXJyZWQuCisgICAgIyBTZWU6IGh0dHA6Ly93d3cu Y21ha2Uub3JnL2NtYWtlL2hlbHAvdjMuMC9jb21tYW5kL2J1aWxkX2NvbW1hbmQuaHRtbAorICAg IHN0cmluZyhSRVBMQUNFICIgLWkiICIgLWsiIENPTU1BTkRfTElORV9UT19CVUlMRCAke0NPTU1B TkRfTElORV9UT19CVUlMRH0pCisgICAgZmlsZShXUklURQorICAgICAgICAke0NNQUtFX0JJTkFS WV9ESVJ9JHtDTUFLRV9GSUxFU19ESVJFQ1RPUll9L2J1aWxkLnNoCisgICAgICAgICIjIS9iaW4v c2hcbiIKKyAgICAgICAgIiR7Q09NTUFORF9MSU5FX1RPX0JVSUxEfSAkQCIKKyAgICApCisgICAg ZmlsZShDT1BZICR7Q01BS0VfQklOQVJZX0RJUn0ke0NNQUtFX0ZJTEVTX0RJUkVDVE9SWX0vYnVp bGQuc2gKKyAgICAgICAgREVTVElOQVRJT04gJHtDTUFLRV9CSU5BUllfRElSfQorICAgICAgICBG SUxFX1BFUk1JU1NJT05TIE9XTkVSX1JFQUQgT1dORVJfV1JJVEUgT1dORVJfRVhFQ1VURSBHUk9V UF9SRUFEIEdST1VQX0VYRUNVVEUKKyAgICApCitlbmRpZiAoKQogCiBpZiAoRU5BQkxFX1NVQlRM RV9DUllQVE8pCiAgICAgZmluZF9wYWNrYWdlKEdudVRMUyAzLjAuMCBSRVFVSVJFRCkKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5ODE1YzRhLi4w OGQyOWEwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDktMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHdGtdIGJ1aWxkLnNoIG5lZWRzIGEgLS0gYmVm b3JlIG1ha2Ugb3B0aW9ucyB3aGVuIHRoZSBidWlsZCBjb21tYW5kIGlzIGNtYWtlIC0tYnVpbGQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjM3Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYnVpbGRDTWFrZUdlbmVyYXRlZFByb2plY3QpOiBP bmx5IHVzZSB0aGUgYnVpbGQuc2ggc2NyaXB0IGlmIGl0IGV4aXN0cy4KKwogMjAxNC0wOS0yMiAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S10gVGVzdCAvd2Via2l0Mi9XZWJLaXRXZWJWaWV3L2Nhbi1zaG93LW1pbWUtdHlwZSBmYWlscyBp ZiBldmluY2UgYnJvd3NlciBwbHVnaW4gaXMgaW5zdGFsbGVkCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXgg ODk4MGUzYi4uYWJkM2U5ZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTg0NSw4ICsxODQ1LDggQEAg c3ViIGJ1aWxkQ01ha2VHZW5lcmF0ZWRQcm9qZWN0KCQpCiAgICAgbXkgQGFyZ3MgPSAoIi0tYnVp bGQiLCAkYnVpbGRQYXRoLCAiLS1jb25maWciLCAkY29uZmlnKTsKICAgICBwdXNoIEBhcmdzLCAo Ii0tIiwgJG1ha2VBcmdzKSBpZiAkbWFrZUFyZ3M7CiAKLSAgICAjIEdUSyB1c2VzIGEgYnVpbGQg c2NyaXB0IHRvIHByZXNlcnZlIGNvbG9ycyBhbmQgcHJldHR5LXByaW50aW5nLgotICAgIGlmIChp c0d0aygpKSB7CisgICAgIyBHVEsgY2FuIHVzZSBhIGJ1aWxkIHNjcmlwdCB0byBwcmVzZXJ2ZSBj b2xvcnMgYW5kIHByZXR0eS1wcmludGluZy4KKyAgICBpZiAoaXNHdGsoKSAmJiAtZSAiJGJ1aWxk UGF0aC9idWlsZC5zaCIpIHsKICAgICAgICAgY2hkaXIgIiRidWlsZFBhdGgiIG9yIGRpZTsKICAg ICAgICAgJGNvbW1hbmQgPSAiJGJ1aWxkUGF0aC9idWlsZC5zaCI7CiAgICAgICAgIEBhcmdzID0g KCRtYWtlQXJncyk7Cg==