58801 2011-04-18 11:20:55 -0700 [WinCairo] "build-webkit --wincairo" thinks you need WebKitSupportLibraries.zip 2011-04-21 22:51:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 387882 0 bfulgham 2011-04-18 11:20:55 -0700 If you run "build-webkit --wincairo", you should be building a release that does not use any of the proprietary Apple libraries. Unfortunately, the "build-webkit" script thinks that you need this zip file and will not continue without it. This issue modifies the "build-webkit" script to ignore the missing zip file if you are building with "--wincairo". 389842 1 90492 bfulgham 2011-04-20 21:56:56 -0700 Created attachment 90492 Patch 389846 2 90493 bfulgham 2011-04-20 22:19:31 -0700 Created attachment 90493 Patch 390083 3 90493 mrobinson 2011-04-21 09:31:01 -0700 Comment on attachment 90493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90493&action=review > Tools/Scripts/build-webkit:-514 > } elsif (isAppleWinWebKit()) { > # Copy WebKitSupportLibrary to the correct location in WebKitLibraries so it can be found. > # Will fail if WebKitSupportLibrary.zip is not in source root. > - (system("perl Tools/Scripts/update-webkit-support-libs") == 0) or die; It's odd that isAppleWinWebKit returns true for WinCairo. It probably shouldn't. > Tools/Scripts/update-webkit:101 > } elsif (isAppleWinWebKit()) { Ditto. :) > Tools/Scripts/webkitdirs.pm:212 > + $configuration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin()); Perhaps you should move this out of the block. You never want to build the Release or Debug configurations if you've specified the WinCairo flag. Why is isCygwin important here? 390088 4 90493 bfulgham 2011-04-21 09:38:35 -0700 Comment on attachment 90493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90493&action=review >> Tools/Scripts/build-webkit:-514 >> - (system("perl Tools/Scripts/update-webkit-support-libs") == 0) or die; > > It's odd that isAppleWinWebKit returns true for WinCairo. It probably shouldn't. Yes, that's probably true. WinCairo piggybacks off of the isAppleWinWebKit for most of its functionality. Changing all of these places would expand the scope of this change considerably. >> Tools/Scripts/update-webkit:101 >> } elsif (isAppleWinWebKit()) { > > Ditto. :) Ditto! :-) >> Tools/Scripts/webkitdirs.pm:212 >> + $configuration .= "_Cairo_CFLite" if (isWinCairo() && isCygwin()); > > Perhaps you should move this out of the block. You never want to build the Release or Debug configurations if you've specified the WinCairo flag. Why is isCygwin important here? That's a good point. I was only thinking about the default case, which is where I ran into the problem. I'll change that. 390602 5 90668 bfulgham 2011-04-21 21:50:12 -0700 Created attachment 90668 Revised per mrobinson's comments 390618 6 90668 mrobinson 2011-04-21 22:34:41 -0700 Comment on attachment 90668 Revised per mrobinson's comments Great! 390622 7 bfulgham 2011-04-21 22:51:26 -0700 Landed in http://trac.webkit.org/changeset/84601 90492 2011-04-20 21:56:56 -0700 2011-04-20 22:19:27 -0700 Patch bug-58801-20110420215654.patch text/plain 2237 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg0NDY2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTEtMDQtMjAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNo IGJ1aWxkLXdlYmtpdCBhbmQgdXBkYXRlLXdlYmtpdCB0aGF0IHRoZSBXaW5DYWlybyBwb3J0IGRv ZXMKKyAgICAgICAgbm90IG5lZWQgdGhlIG5vbi1yZWRpc3RyaWJ1dGFibGUgV2ViS2l0U3VwcG9y dExpYnJhcmllcy56aXAgZmlsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU4ODAxCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogRG9u J3QgZGllIGlmIFdlYktpdFN1cHBvcnRMaWJyYXJpZXMuemlwCisgICAgICAgICAgZG9lc24ndCBl eGlzdC4KKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6IERvbid0IGRpZSBpZiBXZWJL aXRTdXBwb3J0TGlicmFyaWVzLnppcAorICAgICAgICAgIGRvZXNuJ3QgZXhpc3QuCisKIDIwMTEt MDQtMjAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NDQzMS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShy ZXZpc2lvbiA4NDQ2NikKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNv cHkpCkBAIC01MTEsOSArNTExLDkgQEAgaWYgKGlzR3RrKCkpIHsKIH0gZWxzaWYgKGlzQXBwbGVX aW5XZWJLaXQoKSkgewogICAgICMgQ29weSBXZWJLaXRTdXBwb3J0TGlicmFyeSB0byB0aGUgY29y cmVjdCBsb2NhdGlvbiBpbiBXZWJLaXRMaWJyYXJpZXMgc28gaXQgY2FuIGJlIGZvdW5kLgogICAg ICMgV2lsbCBmYWlsIGlmIFdlYktpdFN1cHBvcnRMaWJyYXJ5LnppcCBpcyBub3QgaW4gc291cmNl IHJvb3QuCi0gICAgKHN5c3RlbSgicGVybCBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtc3Vw cG9ydC1saWJzIikgPT0gMCkgb3IgZGllOwotICAgICMgVXBkYXRlIENhaXJvIERlcGVuZGFuY2ll cy4KLSAgICBpZiAoaXNXaW5DYWlybygpKSB7CisgICAgaWYgKCFpc1dpbkNhaXJvKCkpIHsKKyAg ICAgICAgKHN5c3RlbSgicGVybCBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtc3VwcG9ydC1s aWJzIikgPT0gMCkgb3IgZGllOworICAgIH0gZWxzZSB7CiAgICAgICAgIChzeXN0ZW0oInBlcmwg VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMiKSA9PSAwKSBvciBkaWU7 CiAgICAgfQogfSBlbHNpZiAoaXNRdCgpKSB7CkluZGV4OiBUb29scy9TY3JpcHRzL3VwZGF0ZS13 ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CShyZXZpc2lv biA4NDQ2NikKKysrIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAkod29ya2luZyBjb3B5KQpA QCAtOTksOCArOTksOSBAQCBpZiAoLWQgIi4uL0ludGVybmFsIikgewogCiAgICAgc3lzdGVtKCJw ZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSIpID09IDAgb3IgZGll ICQhOwogfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7Ci0gICAgc3lzdGVtKCJwZXJsIiwg IlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1hdXhpbGlhcnktbGlicyIpID09IDAgb3IgZGll OwotICAgIGlmIChpc1dpbkNhaXJvKCkpIHsKKyAgICBpZiAoIWlzV2luQ2Fpcm8oKSkgeworICAg ICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWF1eGlsaWFy eS1saWJzIikgPT0gMCBvciBkaWU7CisgICAgfSBlbHNlIHsKICAgICAgICAgc3lzdGVtKCJwZXJs IiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzIikgPT0gMCBvciBk aWU7CiAgICAgfQogfQo= 90493 2011-04-20 22:19:31 -0700 2011-04-21 21:50:12 -0700 Patch bug-58801-20110420221929.patch text/plain 2980 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg0NDY2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDQtMjAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNo IGJ1aWxkLXdlYmtpdCBhbmQgdXBkYXRlLXdlYmtpdCB0aGF0IHRoZSBXaW5DYWlybyBwb3J0IGRv ZXMKKyAgICAgICAgbm90IG5lZWQgdGhlIG5vbi1yZWRpc3RyaWJ1dGFibGUgV2ViS2l0U3VwcG9y dExpYnJhcmllcy56aXAgZmlsZS4KKyAgICAgICAgQWxzbyBhcHBlbmQgdGhlIF9DYWlyb19DRkxp dGUgbGFiZWwgdG8gdGhlIGJ1aWxkIHRhcmdldCBmb3IgdGhlCisgICAgICAgIGRlZmF1bHQgKG5v IGFyZ3VtZW50KSBjYXNlIHdoZW4gYnVpbGRpbmcgd2l0aCAnLS13aW5jYWlybycKKyAgICAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4ODAxCisKKyAg ICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogRG9uJ3QgZGllIGlmIFdlYktpdFN1cHBvcnRM aWJyYXJpZXMuemlwCisgICAgICAgICAgZG9lc24ndCBleGlzdC4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdGRpcnMucG06IEFwcGVuZCAnX0NhaXJvX0NGTGl0ZScgdG8gdGhlIGRlZmF1bHQKKyAg ICAgICAgICAnUmVsZWFzZScgYnVpbGQgdGFyZ2V0IHdoZW4gcGFzc2VkIHRoZSAnLS13aW5jYWly bycgZmxhZy4KKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6IERvbid0IGRpZSBpZiBX ZWJLaXRTdXBwb3J0TGlicmFyaWVzLnppcAorICAgICAgICAgIGRvZXNuJ3QgZXhpc3QuCisKIDIw MTEtMDQtMjAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NDQzMS4KSW5kZXg6IFRvb2xzL1Njcmlw dHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0 CShyZXZpc2lvbiA4NDQ2NikKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5n IGNvcHkpCkBAIC01MTEsOSArNTExLDkgQEAgaWYgKGlzR3RrKCkpIHsKIH0gZWxzaWYgKGlzQXBw bGVXaW5XZWJLaXQoKSkgewogICAgICMgQ29weSBXZWJLaXRTdXBwb3J0TGlicmFyeSB0byB0aGUg Y29ycmVjdCBsb2NhdGlvbiBpbiBXZWJLaXRMaWJyYXJpZXMgc28gaXQgY2FuIGJlIGZvdW5kLgog ICAgICMgV2lsbCBmYWlsIGlmIFdlYktpdFN1cHBvcnRMaWJyYXJ5LnppcCBpcyBub3QgaW4gc291 cmNlIHJvb3QuCi0gICAgKHN5c3RlbSgicGVybCBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQt c3VwcG9ydC1saWJzIikgPT0gMCkgb3IgZGllOwotICAgICMgVXBkYXRlIENhaXJvIERlcGVuZGFu Y2llcy4KLSAgICBpZiAoaXNXaW5DYWlybygpKSB7CisgICAgaWYgKCFpc1dpbkNhaXJvKCkpIHsK KyAgICAgICAgKHN5c3RlbSgicGVybCBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtc3VwcG9y dC1saWJzIikgPT0gMCkgb3IgZGllOworICAgIH0gZWxzZSB7CiAgICAgICAgIChzeXN0ZW0oInBl cmwgVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMiKSA9PSAwKSBvciBk aWU7CiAgICAgfQogfSBlbHNpZiAoaXNRdCgpKSB7CkluZGV4OiBUb29scy9TY3JpcHRzL3VwZGF0 ZS13ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CShyZXZp c2lvbiA4NDQ2NikKKysrIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAkod29ya2luZyBjb3B5 KQpAQCAtOTksOCArOTksOSBAQCBpZiAoLWQgIi4uL0ludGVybmFsIikgewogCiAgICAgc3lzdGVt KCJwZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSIpID09IDAgb3Ig ZGllICQhOwogfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7Ci0gICAgc3lzdGVtKCJwZXJs IiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1hdXhpbGlhcnktbGlicyIpID09IDAgb3Ig ZGllOwotICAgIGlmIChpc1dpbkNhaXJvKCkpIHsKKyAgICBpZiAoIWlzV2luQ2Fpcm8oKSkgewor ICAgICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWF1eGls aWFyeS1saWJzIikgPT0gMCBvciBkaWU7CisgICAgfSBlbHNlIHsKICAgICAgICAgc3lzdGVtKCJw ZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzIikgPT0gMCBv ciBkaWU7CiAgICAgfQogfQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gODQ0NjYpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTIwOSw2ICsy MDksNyBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAgICAgICAkY29uZmlndXJhdGlv biA9ICJEZWJ1ZyIgaWYgJGNvbmZpZ3VyYXRpb24gZXEgIkRldmVsb3BtZW50IjsKICAgICB9IGVs c2UgewogICAgICAgICAkY29uZmlndXJhdGlvbiA9ICJSZWxlYXNlIjsKKyAgICAgICAgJGNvbmZp Z3VyYXRpb24gLj0gIl9DYWlyb19DRkxpdGUiIGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4o KSk7CiAgICAgfQogfQogCg== 90668 2011-04-21 21:50:12 -0700 2011-04-21 22:34:40 -0700 Revised per mrobinson's comments build_cairo.patch text/plain 3063 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg0NTk4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDQtMjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlYWNo IGJ1aWxkLXdlYmtpdCBhbmQgdXBkYXRlLXdlYmtpdCB0aGF0IHRoZSBXaW5DYWlybyBwb3J0IGRv ZXMKKyAgICAgICAgbm90IG5lZWQgdGhlIG5vbi1yZWRpc3RyaWJ1dGFibGUgV2ViS2l0U3VwcG9y dExpYnJhcmllcy56aXAgZmlsZS4KKyAgICAgICAgQWxzbyBhcHBlbmQgdGhlIF9DYWlyb19DRkxp dGUgbGFiZWwgdG8gdGhlIGJ1aWxkIHRhcmdldCBmb3IgdGhlCisgICAgICAgIGRlZmF1bHQgKG5v IGFyZ3VtZW50KSBjYXNlIHdoZW4gYnVpbGRpbmcgd2l0aCAnLS13aW5jYWlybycKKyAgICAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4ODAxCisKKyAg ICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogRG9uJ3QgZGllIGlmIFdlYktpdFN1cHBvcnRM aWJyYXJpZXMuemlwCisgICAgICAgICAgZG9lc24ndCBleGlzdC4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdGRpcnMucG06IEFwcGVuZCAnX0NhaXJvX0NGTGl0ZScgdG8gdGhlIGRlZmF1bHQKKyAg ICAgICAgICAnUmVsZWFzZScgYnVpbGQgdGFyZ2V0IHdoZW4gcGFzc2VkIHRoZSAnLS13aW5jYWly bycgZmxhZy4KKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6IERvbid0IGRpZSBpZiBX ZWJLaXRTdXBwb3J0TGlicmFyaWVzLnppcAorICAgICAgICAgIGRvZXNuJ3QgZXhpc3QuCisKIDIw MTEtMDQtMjEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtp dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkocmV2aXNpb24gODQ1 OTgpCisrKyBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2luZyBjb3B5KQpAQCAtNTEy LDE0ICs1MTIsMTIgQEAgaWYgKGlzR3RrKCkpIHsKICAgICAgICAgcHJpbnQgIlVwZGF0aW5nICRo ZWFkZXJEaXJcbiI7CiAgICAgICAgIHN5c3RlbSAiZGl0dG8iLCAkc3JjSGVhZGVyRGlyLCAkaGVh ZGVyRGlyOwogICAgIH0KK30gZWxzaWYgKGlzV2luQ2Fpcm8oKSkgeworICAgIChzeXN0ZW0oInBl cmwgVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMiKSA9PSAwKSBvciBk aWU7CiB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKICAgICAjIENvcHkgV2ViS2l0U3Vw cG9ydExpYnJhcnkgdG8gdGhlIGNvcnJlY3QgbG9jYXRpb24gaW4gV2ViS2l0TGlicmFyaWVzIHNv IGl0IGNhbiBiZSBmb3VuZC4KICAgICAjIFdpbGwgZmFpbCBpZiBXZWJLaXRTdXBwb3J0TGlicmFy eS56aXAgaXMgbm90IGluIHNvdXJjZSByb290LgogICAgIChzeXN0ZW0oInBlcmwgVG9vbHMvU2Ny aXB0cy91cGRhdGUtd2Via2l0LXN1cHBvcnQtbGlicyIpID09IDApIG9yIGRpZTsKLSAgICAjIFVw ZGF0ZSBDYWlybyBEZXBlbmRhbmNpZXMuCi0gICAgaWYgKGlzV2luQ2Fpcm8oKSkgewotICAgICAg ICAoc3lzdGVtKCJwZXJsIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJz IikgPT0gMCkgb3IgZGllOwotICAgIH0KIH0gZWxzaWYgKGlzUXQoKSkgewogICAgIHB1c2ggQG9w dGlvbnMsICItLWluc3RhbGwtaGVhZGVycz0iIC4gJGluc3RhbGxIZWFkZXJzIGlmIGRlZmluZWQo JGluc3RhbGxIZWFkZXJzKTsKICAgICBwdXNoIEBvcHRpb25zLCAiLS1pbnN0YWxsLWxpYnM9IiAu ICRpbnN0YWxsTGlicyBpZiBkZWZpbmVkKCRpbnN0YWxsTGlicyk7CkluZGV4OiBUb29scy9TY3Jp cHRzL3VwZGF0ZS13ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Vi a2l0CShyZXZpc2lvbiA4NDU5OCkKKysrIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAkod29y a2luZyBjb3B5KQpAQCAtMTAxLDYgKzEwMSw3IEBAIGlmICgtZCAiLi4vSW50ZXJuYWwiKSB7CiB9 IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMv U2NyaXB0cy91cGRhdGUtd2Via2l0LWF1eGlsaWFyeS1saWJzIikgPT0gMCBvciBkaWU7CiAgICAg aWYgKGlzV2luQ2Fpcm8oKSkgeworICAgICAgICAjIFdpbkNhaXJvIHNoYXJlcyB0aGUgYXV4aWxp YXJ5IGxpYnMgZnJvbSB0aGUgQXBwbGUgcG9ydC4KICAgICAgICAgc3lzdGVtKCJwZXJsIiwgIlRv b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzIikgPT0gMCBvciBkaWU7CiAg ICAgfQogfQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gODQ1OTgpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTIxMCw2ICsyMTAsMTAgQEAg c3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb24KICAgICB9IGVsc2UgewogICAgICAgICAkY29uZmln dXJhdGlvbiA9ICJSZWxlYXNlIjsKICAgICB9CisKKyAgICBpZiAoJGNvbmZpZ3VyYXRpb24gJiYg aXNXaW5DYWlybygpKSB7CisgICAgICAgICRjb25maWd1cmF0aW9uIC49ICJfQ2Fpcm9fQ0ZMaXRl IjsKKyAgICB9CiB9CiAKIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUK