107714 2013-01-23 11:56:00 -0800 [Windows] Update WebKitDirs.pm for new Windows paths 2013-02-12 17:02:28 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 106949 109472 109478 1 bfulgham bfulgham dbates roger_fong thorton webkit.review.bot oldest_to_newest 814448 0 bfulgham 2013-01-23 11:56:00 -0800 Some environment variable names were changed in Bug 106949 to reduce clutter and crazy 5-level "up directory" pathing. The WebKit script tools need to be updated to make sure the developer's environment has the proper variables set: WEBKITLIBRARIES -> WEBKIT_LIBRARIES WEBKITOUTPUTDIR -> WEBKIT_OUTPUTDIR WEBKIT_TESTFONTS (stayed the same) Added WEBKIT_SOURCE to point to Source directory of webkit checkout 829415 1 187508 bfulgham 2013-02-10 20:17:28 -0800 Created attachment 187508 Patch 829417 2 bfulgham 2013-02-10 20:19:58 -0800 This first patch updates webkitdirs.pm so that the new environment variables are properly set for both VS2005 and VS2010 builds. A future update will remove the VS2005 support, but not until the build machines have switched to the new compiler. 829425 3 187511 bfulgham 2013-02-10 21:01:43 -0800 Created attachment 187511 Patch 829426 4 bfulgham 2013-02-10 21:02:43 -0800 I made a mistake in the setting of the WebKit_Source environment variable. It needs to be of the actual "Source" sub-directory of the WebKit source tree. 829475 5 187511 dbates 2013-02-11 00:39:03 -0800 Comment on attachment 187511 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187511&action=review For completeness, we should look to update the following web pages that reference the environment variables WEBKITOUTPUTDIR or WEBKITLIBRARIESDIR: Building WebKit, <http://www.webkit.org/building/build.html> Apple Windows Port/Building on Windows, <https://trac.webkit.org/wiki/BuildingOnWindows> Cairo-based Windows Port/Building Cairo on Windows, <https://trac.webkit.org/wiki/BuildingCairoOnWindows> Building the Qt port on Linux, <https://trac.webkit.org/wiki/BuildingQtOnLinux> Building Qt On OSX , <https://trac.webkit.org/wiki/BuildingQtOnOSX> TinOS's WebKit Port/Building on Windows Embedded CE, <https://trac.webkit.org/wiki/TinOS> (is the information on this page still applicable?) Setting Up Development Environment For N9, <https://trac.webkit.org/wiki/SettingUpDevelopmentEnvironmentForN9> EFL Port of WebKit, <https://trac.webkit.org/wiki/EFLWebKit> > Tools/ChangeLog:3 > + Update WebKitDirs.pm for new Windows Paths Nit: Paths => paths > Tools/Scripts/webkitdirs.pm:190 > + $baseProductDir = $ENV{"WEBKITOUTPUTDIR"}; #Fixme: Switch to WEBKIT_OUTPUTDIR in future Nit: "#Fixme:" => "# FIXME: " (Notice the space character after the '#' and the use of capitals). I also suggest making this comment a full sentence by adding the word "the" before the word "future" and ending the comment with a period. Do we have an idea of a timetable for addressing this FIXME? If we don't have a timetable or the timetable is far out then we may want to file a bug to address this FIXME and reference the bug number in this comment. > Tools/Scripts/webkitdirs.pm:1646 > +sub windowsSourceSourceDir() I wish we could up with a better name for this function given that the word "Source" has two different meanings: the top-level WebKit directory and the sub-directory whose name is Source. Although the name of this function is clarified by reading its implementation, which is concise. > Tools/Scripts/webkitdirs.pm:1697 > + # VS2005 Version. This will go away in a future commit. Nit: Version => version (The word "Version" also appears on line 1711). > Tools/Scripts/webkitdirs.pm:1719 > + if (!$ENV{'WEBKIT_LIBRARIES'}) { > + # New VS2010 support. Will replace VS2005 version in the future. > + print "Warning: You must set the 'WebKit_Libraries' environment variable\n"; > + print " to be able build WebKit from within Visual Studio.\n"; > + print " Make sure that 'WebKit_Libraries' points to the\n"; > + print " 'WebKitLibraries/win' directory, not the 'WebKitLibraries/' directory.\n\n"; > + } > if (!$ENV{'WEBKITOUTPUTDIR'}) { > + # VS2005 Version. This will go away in a future commit. > print "Warning: You must set the 'WebKitOutputDir' environment variable\n"; > print " to be able build WebKit from within Visual Studio.\n\n"; > } > + if (!$ENV{'WEBKIT_OUTPUTDIR'}) { > + # New VS2010 support. Will replace VS2005 version in the future. > + print "Warning: You must set the 'WebKit_OutputDir' environment variable\n"; > + print " to be able build WebKit from within Visual Studio.\n\n"; > + } Did you intend to emit warnings about missing environment variables WEBKIT_LIBRARIES and WEBKIT_OUTPUTDIR when building in an environment that defines WEBKITOUTPUTDIR and WEBKITLIBRARIESDIR? 830023 6 187647 bfulgham 2013-02-11 13:11:57 -0800 Created attachment 187647 Patch 830038 7 bfulgham 2013-02-11 13:21:43 -0800 Thanks for taking the time to review this change! (In reply to comment #5) > For completeness, we should look to update the following web pages that reference the environment variables WEBKITOUTPUTDIR or WEBKITLIBRARIESDIR: Good point. I created Bug 109478 to track this. > Do we have an idea of a timetable for addressing this FIXME? If we don't have a timetable or the timetable is far out then we may want to file a bug to address this FIXME and reference the bug number in this comment. I created Bug 109472 to track removing the VS2005 cruft once the build system cuts over to VS2010+. > > Tools/Scripts/webkitdirs.pm:1646 > > +sub windowsSourceSourceDir() > > I wish we could up with a better name for this function given that the word "Source" has two different meanings: the top-level WebKit directory and the sub-directory whose name is Source. Although the name of this function is clarified by reading its implementation, which is concise. Yes, I couldn't think of anything better. The existing "windowsSourceDir" could perhaps be renamed to "windowsSourceRootDir", or maybe just "windowsRootDir", but I didn't think it was appropriate to change the existing naming. > Did you intend to emit warnings about missing environment variables WEBKIT_LIBRARIES and WEBKIT_OUTPUTDIR when building in an environment that defines WEBKITOUTPUTDIR and WEBKITLIBRARIESDIR? Yes. The library doesn't currently distinguish what kind of build (VS2005 or VS2010) is currently being done, so I thought it would be best to just require both sets of variables, thereby ensuring everyone will be capable of building using either toolset. Existing users will already have the 'old' environment variables set, and will now get the 'new' values added to their environment. New users will (regrettably) get the 'old' values in addition to the 'new', until we cut over, but that seems like a small price for the convenience this script provides. All of your other comments have been incorporated into my latest patch. 831132 8 dbates 2013-02-12 11:49:15 -0800 (In reply to comment #7) > [...] > New users will (regrettably) get the 'old' values in addition to the 'new', until we cut over, but that seems like a small price for the convenience this script provides. OK. It would be nice if we could determine whether Visual Studio 2010 is installed so that we don't instruct people with such installations to set the deprecated environment variables WEBKITOUTPUTDIR and WEBKITLIBRARIESDIR. Having said that, as we work to deprecate Visual Studio 2005 we will be able to clean up WebKitDirs.pm. 831134 9 187647 dbates 2013-02-12 11:50:52 -0800 Comment on attachment 187647 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187647&action=review > Tools/Scripts/webkitdirs.pm:1702 > print "Warning: You must set the 'WebKitLibrariesDir' environment variable\n"; > print " to be able build WebKit from within Visual Studio.\n"; > print " Make sure that 'WebKitLibrariesDir' points to the\n"; > print " 'WebKitLibraries/win' directory, not the 'WebKitLibraries/' directory.\n\n"; For your consideration I suggest we make it clear that this warning is applicable when building with Visual Studio 2005 by explicitly mentioning "Visual Studio 2005" similar to what you did in the Visual Studio 2010 warning messages (below). > Tools/Scripts/webkitdirs.pm:1715 > + # VS2005 version. This will be removed as part of https://bugs.webkit.org/show_bug.cgi?id=109472. > print "Warning: You must set the 'WebKitOutputDir' environment variable\n"; > print " to be able build WebKit from within Visual Studio.\n\n"; Ditto. 831438 10 bfulgham 2013-02-12 17:02:28 -0800 Committed r142692: <http://trac.webkit.org/changeset/142692> 187508 2013-02-10 20:17:28 -0800 2013-02-10 21:01:40 -0800 Patch bug-107714-20130210201402.patch text/plain 5735 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0MjQyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTAyLTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9y Zz4KKworICAgICAgICBVcGRhdGUgV2ViS2l0RGlycy5wbSBmb3IgbmV3IFdpbmRvd3MgUGF0aHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzcxNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOiBGb3IgZWFjaCBleGlzdGluZyBXaW5kb3dzIGVudmlyb25tZW50Cisg ICAgICAgIHZhcmlhYmxlLCBhbHNvIGluY2x1ZGUgY3JlYXRpb24gb2YgdGhlICduZXcnIHZhcmlh Ymxlcy4gVGhlCisgICAgICAgICdvbGQnIHZhcmlhYmxlcyB3aWxsIGJlIHJlbW92ZWQgaW4gYSBm dXR1cmUgdXBkYXRlLgorCiAyMDEzLTAyLTEwICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdGVkIGJ1aWxkIGZpeCBmb3Ig R3RrIGFmdGVyIHIxNDI0MTIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE0MjQyMykK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTg3LDcg KzE4Nyw3IEBAIHN1YiBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcgogICAgIGRldGVybWluZVNvdXJj ZURpcigpOwogCiAgICAgbXkgJHNldFNoYXJlZFByZWNvbXBzRGlyOwotICAgICRiYXNlUHJvZHVj dERpciA9ICRFTlZ7IldFQktJVE9VVFBVVERJUiJ9OworICAgICRiYXNlUHJvZHVjdERpciA9ICRF TlZ7IldFQktJVE9VVFBVVERJUiJ9OyAjRml4bWU6IFN3aXRjaCB0byBXRUJLSVRfT1VUUFVURElS IGluIGZ1dHVyZQogCiAgICAgaWYgKCFkZWZpbmVkKCRiYXNlUHJvZHVjdERpcikgYW5kIGlzQXBw bGVNYWNXZWJLaXQoKSkgewogICAgICAgICAjIFNpbGVudGx5IHJlbW92ZSB+L0xpYnJhcnkvUHJl ZmVyZW5jZXMveGNvZGVidWlsZC5wbGlzdCB3aGljaCBjYW4KQEAgLTI2MCw2ICsyNjAsNyBAQCBz dWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICAgICAgbXkgJGRvc0J1aWxkUGF0aCA9IGBj eWdwYXRoIC0td2luZG93cyBcIiRiYXNlUHJvZHVjdERpclwiYDsKICAgICAgICAgY2hvbXAgJGRv c0J1aWxkUGF0aDsKICAgICAgICAgJEVOVnsiV0VCS0lUT1VUUFVURElSIn0gPSAkZG9zQnVpbGRQ YXRoOworICAgICAgICAkRU5WeyJXRUJLSVRfT1VUUFVURElSIn0gPSAkZG9zQnVpbGRQYXRoOwog ICAgICAgICBteSAkdW5peEJ1aWxkUGF0aCA9IGBjeWdwYXRoIC0tdW5peCBcIiRiYXNlUHJvZHVj dERpclwiYDsKICAgICAgICAgY2hvbXAgJHVuaXhCdWlsZFBhdGg7CiAgICAgICAgICRiYXNlUHJv ZHVjdERpciA9ICR1bml4QnVpbGRQYXRoOwpAQCAtMTY3MiwxMiArMTY3MywxNSBAQCBzdWIgc2V0 dXBBcHBsZVdpbkVudigpCiAgICAgICAgIAogICAgICAgICAjIFRob3NlIGVudmlyb25tZW50IHZh cmlhYmxlcyBtdXN0IGJlIHNldCB0byBiZSBhYmxlIHRvIGJ1aWxkIGluc2lkZSBWaXN1YWwgU3R1 ZGlvLgogICAgICAgICAkdmFyaWFibGVzVG9TZXR7V0VCS0lUTElCUkFSSUVTRElSfSA9IHdpbmRv d3NMaWJyYXJpZXNEaXIoKSB1bmxlc3MgJEVOVntXRUJLSVRMSUJSQVJJRVNESVJ9OworICAgICAg ICAkdmFyaWFibGVzVG9TZXR7V0VCS0lUX0xJQlJBUklFU30gPSB3aW5kb3dzTGlicmFyaWVzRGly KCkgdW5sZXNzICRFTlZ7V0VCS0lUX0xJQlJBUklFU307CiAgICAgICAgICR2YXJpYWJsZXNUb1Nl dHtXRUJLSVRPVVRQVVRESVJ9ID0gd2luZG93c091dHB1dERpcigpIHVubGVzcyAkRU5We1dFQktJ VE9VVFBVVERJUn07CisgICAgICAgICR2YXJpYWJsZXNUb1NldHtXRUJLSVRfT1VUUFVURElSfSA9 IHdpbmRvd3NPdXRwdXREaXIoKSB1bmxlc3MgJEVOVntXRUJLSVRfT1VUUFVURElSfTsKKyAgICAg ICAgJHZhcmlhYmxlc1RvU2V0e1dFQktJVF9TT1VSQ0V9ID0gd2luZG93c1NvdXJjZURpcigpIHVu bGVzcyAkRU5We1dFQktJVF9TT1VSQ0V9OwogCiAgICAgICAgIGZvcmVhY2ggbXkgJHZhcmlhYmxl IChrZXlzICV2YXJpYWJsZXNUb1NldCkgewogICAgICAgICAgICAgcHJpbnQgIlNldHRpbmcgdGhl IEVudmlyb25tZW50IFZhcmlhYmxlICciIC4gJHZhcmlhYmxlIC4gIicgdG8gJyIgLiAkdmFyaWFi bGVzVG9TZXR7JHZhcmlhYmxlfSAuICInXG5cbiI7CiAgICAgICAgICAgICBzeXN0ZW0gcXcocmVn dG9vbCAtcyBzZXQpLCAnXFxIS0VZX0NVUlJFTlRfVVNFUlxcRW52aXJvbm1lbnRcXCcgLiAkdmFy aWFibGUsICR2YXJpYWJsZXNUb1NldHskdmFyaWFibGV9OwotICAgICAgICAgICAgJHJlc3RhcnRO ZWVkZWQgfHw9ICR2YXJpYWJsZSBlcSAiV0VCS0lUTElCUkFSSUVTRElSIiB8fCAkdmFyaWFibGUg ZXEgIldFQktJVE9VVFBVVERJUiI7CisgICAgICAgICAgICAkcmVzdGFydE5lZWRlZCB8fD0gJHZh cmlhYmxlIGVxICJXRUJLSVRMSUJSQVJJRVNESVIiIHx8ICR2YXJpYWJsZSBlcSAiV0VCS0lUT1VU UFVURElSIiB8fCAkdmFyaWFibGUgZXEgIldFQktJVF9MSUJSQVJJRVMiIHx8ICR2YXJpYWJsZSBl cSAiV0VCS0lUX09VVFBVVERJUiIgfHwgJHZhcmlhYmxlIGVxICJXRUJLSVRfU09VUkNFIjsKICAg ICAgICAgfQogCiAgICAgICAgIGlmICgkcmVzdGFydE5lZWRlZCkgewpAQCAtMTY4NSwxNSArMTY4 OSwzMyBAQCBzdWIgc2V0dXBBcHBsZVdpbkVudigpCiAgICAgICAgIH0KICAgICB9IGVsc2Ugewog ICAgICAgICBpZiAoISRFTlZ7J1dFQktJVExJQlJBUklFU0RJUid9KSB7CisgICAgICAgICAgICAj IFZTMjAwNSBWZXJzaW9uLiAgVGhpcyB3aWxsIGdvIGF3YXkgaW4gYSBmdXR1cmUgY29tbWl0Lgog ICAgICAgICAgICAgcHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0IHNldCB0aGUgJ1dlYktpdExpYnJh cmllc0RpcicgZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7CiAgICAgICAgICAgICBwcmludCAiICAg ICAgICAgdG8gYmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRpby5c biI7CiAgICAgICAgICAgICBwcmludCAiICAgICAgICAgTWFrZSBzdXJlIHRoYXQgJ1dlYktpdExp YnJhcmllc0RpcicgcG9pbnRzIHRvIHRoZVxuIjsKICAgICAgICAgICAgIHByaW50ICIgICAgICAg ICAnV2ViS2l0TGlicmFyaWVzL3dpbicgZGlyZWN0b3J5LCBub3QgdGhlICdXZWJLaXRMaWJyYXJp ZXMvJyBkaXJlY3RvcnkuXG5cbiI7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCEkRU5WeydXRUJL SVRfTElCUkFSSUVTJ30pIHsKKyAgICAgICAgICAgICMgTmV3IFZTMjAxMCBzdXBwb3J0LiBXaWxs IHJlcGxhY2UgVlMyMDA1IHZlcnNpb24gaW4gdGhlIGZ1dHVyZS4KKyAgICAgICAgICAgIHByaW50 ICJXYXJuaW5nOiBZb3UgbXVzdCBzZXQgdGhlICdXZWJLaXRfTGlicmFyaWVzJyBlbnZpcm9ubWVu dCB2YXJpYWJsZVxuIjsKKyAgICAgICAgICAgIHByaW50ICIgICAgICAgICB0byBiZSBhYmxlIGJ1 aWxkIFdlYktpdCBmcm9tIHdpdGhpbiBWaXN1YWwgU3R1ZGlvLlxuIjsKKyAgICAgICAgICAgIHBy aW50ICIgICAgICAgICBNYWtlIHN1cmUgdGhhdCAnV2ViS2l0X0xpYnJhcmllcycgcG9pbnRzIHRv IHRoZVxuIjsKKyAgICAgICAgICAgIHByaW50ICIgICAgICAgICAnV2ViS2l0TGlicmFyaWVzL3dp bicgZGlyZWN0b3J5LCBub3QgdGhlICdXZWJLaXRMaWJyYXJpZXMvJyBkaXJlY3RvcnkuXG5cbiI7 CisgICAgICAgIH0KICAgICAgICAgaWYgKCEkRU5WeydXRUJLSVRPVVRQVVRESVInfSkgeworICAg ICAgICAgICAgIyBWUzIwMDUgVmVyc2lvbi4gIFRoaXMgd2lsbCBnbyBhd2F5IGluIGEgZnV0dXJl IGNvbW1pdC4KICAgICAgICAgICAgIHByaW50ICJXYXJuaW5nOiBZb3UgbXVzdCBzZXQgdGhlICdX ZWJLaXRPdXRwdXREaXInIGVudmlyb25tZW50IHZhcmlhYmxlXG4iOwogICAgICAgICAgICAgcHJp bnQgIiAgICAgICAgIHRvIGJlIGFibGUgYnVpbGQgV2ViS2l0IGZyb20gd2l0aGluIFZpc3VhbCBT dHVkaW8uXG5cbiI7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCEkRU5WeydXRUJLSVRfT1VUUFVU RElSJ30pIHsKKyAgICAgICAgICAgICMgTmV3IFZTMjAxMCBzdXBwb3J0LiBXaWxsIHJlcGxhY2Ug VlMyMDA1IHZlcnNpb24gaW4gdGhlIGZ1dHVyZS4KKyAgICAgICAgICAgIHByaW50ICJXYXJuaW5n OiBZb3UgbXVzdCBzZXQgdGhlICdXZWJLaXRfT3V0cHV0RGlyJyBlbnZpcm9ubWVudCB2YXJpYWJs ZVxuIjsKKyAgICAgICAgICAgIHByaW50ICIgICAgICAgICB0byBiZSBhYmxlIGJ1aWxkIFdlYktp dCBmcm9tIHdpdGhpbiBWaXN1YWwgU3R1ZGlvLlxuXG4iOworICAgICAgICB9CisgICAgICAgIGlm ICghJEVOVnsnV0VCS0lUX1NPVVJDRSd9KSB7CisgICAgICAgICAgICBwcmludCAiV2FybmluZzog WW91IG11c3Qgc2V0IHRoZSAnV2ViS2l0X1NvdXJjZScgZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7 CisgICAgICAgICAgICBwcmludCAiICAgICAgICAgdG8gYmUgYWJsZSBidWlsZCBXZWJLaXQgZnJv bSB3aXRoaW4gVmlzdWFsIFN0dWRpby5cblxuIjsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAt MTc0NCwxMCArMTc2NiwxNiBAQCBzdWIgc2V0dXBDeWd3aW5FbnYoKQogICAgICAgICAkRU5WeydX RUJLSVRMSUJSQVJJRVNESVInfSA9IEZpbGU6OlNwZWMtPmNhdGRpcigkc291cmNlRGlyLCAiV2Vi S2l0TGlicmFyaWVzIiwgIndpbiIpOwogICAgICAgICBjaG9tcCgkRU5We1dFQktJVExJQlJBUklF U0RJUn0gPSBgY3lncGF0aCAtd2EgJyRFTlZ7V0VCS0lUTElCUkFSSUVTRElSfSdgKSBpZiBpc0N5 Z3dpbigpOwogICAgIH0KKyAgICB1bmxlc3MgKCRFTlZ7V0VCS0lUX0xJQlJBUklFU30pIHsKKyAg ICAgICAgJEVOVnsnV0VCS0lUX0xJQlJBUklFUyd9ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRzb3Vy Y2VEaXIsICJXZWJLaXRMaWJyYXJpZXMiLCAid2luIik7CisgICAgICAgIGNob21wKCRFTlZ7V0VC S0lUX0xJQlJBUklFU30gPSBgY3lncGF0aCAtd2EgJyRFTlZ7V0VCS0lUX0xJQlJBUklFU30nYCkg aWYgaXNDeWd3aW4oKTsKKyAgICB9CiAKICAgICBwcmludCAiQnVpbGRpbmcgcmVzdWx0cyBpbnRv OiAiLCBiYXNlUHJvZHVjdERpcigpLCAiXG4iOwogICAgIHByaW50ICJXRUJLSVRPVVRQVVRESVIg aXMgc2V0IHRvOiAiLCAkRU5WeyJXRUJLSVRPVVRQVVRESVIifSwgIlxuIjsKKyAgICBwcmludCAi V0VCS0lUX09VVFBVVERJUiBpcyBzZXQgdG86ICIsICRFTlZ7IldFQktJVF9PVVRQVVRESVIifSwg IlxuIjsKICAgICBwcmludCAiV0VCS0lUTElCUkFSSUVTRElSIGlzIHNldCB0bzogIiwgJEVOVnsi V0VCS0lUTElCUkFSSUVTRElSIn0sICJcbiI7CisgICAgcHJpbnQgIldFQktJVF9MSUJSQVJJRVMg aXMgc2V0IHRvOiAiLCAkRU5WeyJXRUJLSVRfTElCUkFSSUVTIn0sICJcbiI7CiB9CiAKIHN1YiBk aWVJZldpbmRvd3NQbGF0Zm9ybVNES05vdEluc3RhbGxlZAo= 187511 2013-02-10 21:01:43 -0800 2013-02-11 13:11:55 -0800 Patch bug-107714-20130210205817.patch text/plain 6122 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0MjQyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDEzLTAyLTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9y Zz4KKworICAgICAgICBVcGRhdGUgV2ViS2l0RGlycy5wbSBmb3IgbmV3IFdpbmRvd3MgUGF0aHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzcxNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOiBGb3IgZWFjaCBleGlzdGluZyBXaW5kb3dzIGVudmlyb25tZW50Cisg ICAgICAgIHZhcmlhYmxlLCBhbHNvIGluY2x1ZGUgY3JlYXRpb24gb2YgdGhlICduZXcnIHZhcmlh Ymxlcy4gVGhlCisgICAgICAgICdvbGQnIHZhcmlhYmxlcyB3aWxsIGJlIHJlbW92ZWQgaW4gYSBm dXR1cmUgdXBkYXRlLgorICAgICAgICAod2luZG93c1NvdXJjZVNvdXJjZURpcik6IE5ldyBoZWxw ZXIgcm91dGluZSB0byByZXR1cm4gdGhlCisgICAgICAgIGFjdHVhbCAnU291cmNlJyBmb2xkZXIg b2YgdGhlIFdlYktpdCBzb3VyY2UgdHJlZS4KKwogMjAxMy0wMi0xMCAgVGltIEhvcnRvbiAgPHRp bW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGF0dGVtcHRlZCBi dWlsZCBmaXggZm9yIEd0ayBhZnRlciByMTQyNDEyCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZp c2lvbiAxNDI0MjYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29w eSkKQEAgLTE4Nyw3ICsxODcsNyBAQCBzdWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICBk ZXRlcm1pbmVTb3VyY2VEaXIoKTsKIAogICAgIG15ICRzZXRTaGFyZWRQcmVjb21wc0RpcjsKLSAg ICAkYmFzZVByb2R1Y3REaXIgPSAkRU5WeyJXRUJLSVRPVVRQVVRESVIifTsKKyAgICAkYmFzZVBy b2R1Y3REaXIgPSAkRU5WeyJXRUJLSVRPVVRQVVRESVIifTsgI0ZpeG1lOiBTd2l0Y2ggdG8gV0VC S0lUX09VVFBVVERJUiBpbiBmdXR1cmUKIAogICAgIGlmICghZGVmaW5lZCgkYmFzZVByb2R1Y3RE aXIpIGFuZCBpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgIyBTaWxlbnRseSByZW1vdmUg fi9MaWJyYXJ5L1ByZWZlcmVuY2VzL3hjb2RlYnVpbGQucGxpc3Qgd2hpY2ggY2FuCkBAIC0yNjAs NiArMjYwLDcgQEAgc3ViIGRldGVybWluZUJhc2VQcm9kdWN0RGlyCiAgICAgICAgIG15ICRkb3NC dWlsZFBhdGggPSBgY3lncGF0aCAtLXdpbmRvd3MgXCIkYmFzZVByb2R1Y3REaXJcImA7CiAgICAg ICAgIGNob21wICRkb3NCdWlsZFBhdGg7CiAgICAgICAgICRFTlZ7IldFQktJVE9VVFBVVERJUiJ9 ID0gJGRvc0J1aWxkUGF0aDsKKyAgICAgICAgJEVOVnsiV0VCS0lUX09VVFBVVERJUiJ9ID0gJGRv c0J1aWxkUGF0aDsKICAgICAgICAgbXkgJHVuaXhCdWlsZFBhdGggPSBgY3lncGF0aCAtLXVuaXgg XCIkYmFzZVByb2R1Y3REaXJcImA7CiAgICAgICAgIGNob21wICR1bml4QnVpbGRQYXRoOwogICAg ICAgICAkYmFzZVByb2R1Y3REaXIgPSAkdW5peEJ1aWxkUGF0aDsKQEAgLTE2NDIsNiArMTY0Mywx MSBAQCBzdWIgd2luZG93c1NvdXJjZURpcigpCiAgICAgcmV0dXJuICR3aW5kb3dzU291cmNlRGly OwogfQogCitzdWIgd2luZG93c1NvdXJjZVNvdXJjZURpcigpCit7CisgICAgcmV0dXJuIHdpbmRv d3NTb3VyY2VEaXIoKSAuICJcXFNvdXJjZSI7Cit9CisKIHN1YiB3aW5kb3dzTGlicmFyaWVzRGly KCkKIHsKICAgICByZXR1cm4gd2luZG93c1NvdXJjZURpcigpIC4gIlxcV2ViS2l0TGlicmFyaWVz XFx3aW4iOwpAQCAtMTY3MiwxMiArMTY3OCwxNSBAQCBzdWIgc2V0dXBBcHBsZVdpbkVudigpCiAg ICAgICAgIAogICAgICAgICAjIFRob3NlIGVudmlyb25tZW50IHZhcmlhYmxlcyBtdXN0IGJlIHNl dCB0byBiZSBhYmxlIHRvIGJ1aWxkIGluc2lkZSBWaXN1YWwgU3R1ZGlvLgogICAgICAgICAkdmFy aWFibGVzVG9TZXR7V0VCS0lUTElCUkFSSUVTRElSfSA9IHdpbmRvd3NMaWJyYXJpZXNEaXIoKSB1 bmxlc3MgJEVOVntXRUJLSVRMSUJSQVJJRVNESVJ9OworICAgICAgICAkdmFyaWFibGVzVG9TZXR7 V0VCS0lUX0xJQlJBUklFU30gPSB3aW5kb3dzTGlicmFyaWVzRGlyKCkgdW5sZXNzICRFTlZ7V0VC S0lUX0xJQlJBUklFU307CiAgICAgICAgICR2YXJpYWJsZXNUb1NldHtXRUJLSVRPVVRQVVRESVJ9 ID0gd2luZG93c091dHB1dERpcigpIHVubGVzcyAkRU5We1dFQktJVE9VVFBVVERJUn07CisgICAg ICAgICR2YXJpYWJsZXNUb1NldHtXRUJLSVRfT1VUUFVURElSfSA9IHdpbmRvd3NPdXRwdXREaXIo KSB1bmxlc3MgJEVOVntXRUJLSVRfT1VUUFVURElSfTsKKyAgICAgICAgJHZhcmlhYmxlc1RvU2V0 e1dFQktJVF9TT1VSQ0V9ID0gd2luZG93c1NvdXJjZVNvdXJjZURpcigpIHVubGVzcyAkRU5We1dF QktJVF9TT1VSQ0V9OwogCiAgICAgICAgIGZvcmVhY2ggbXkgJHZhcmlhYmxlIChrZXlzICV2YXJp YWJsZXNUb1NldCkgewogICAgICAgICAgICAgcHJpbnQgIlNldHRpbmcgdGhlIEVudmlyb25tZW50 IFZhcmlhYmxlICciIC4gJHZhcmlhYmxlIC4gIicgdG8gJyIgLiAkdmFyaWFibGVzVG9TZXR7JHZh cmlhYmxlfSAuICInXG5cbiI7CiAgICAgICAgICAgICBzeXN0ZW0gcXcocmVndG9vbCAtcyBzZXQp LCAnXFxIS0VZX0NVUlJFTlRfVVNFUlxcRW52aXJvbm1lbnRcXCcgLiAkdmFyaWFibGUsICR2YXJp YWJsZXNUb1NldHskdmFyaWFibGV9OwotICAgICAgICAgICAgJHJlc3RhcnROZWVkZWQgfHw9ICR2 YXJpYWJsZSBlcSAiV0VCS0lUTElCUkFSSUVTRElSIiB8fCAkdmFyaWFibGUgZXEgIldFQktJVE9V VFBVVERJUiI7CisgICAgICAgICAgICAkcmVzdGFydE5lZWRlZCB8fD0gJHZhcmlhYmxlIGVxICJX RUJLSVRMSUJSQVJJRVNESVIiIHx8ICR2YXJpYWJsZSBlcSAiV0VCS0lUT1VUUFVURElSIiB8fCAk dmFyaWFibGUgZXEgIldFQktJVF9MSUJSQVJJRVMiIHx8ICR2YXJpYWJsZSBlcSAiV0VCS0lUX09V VFBVVERJUiIgfHwgJHZhcmlhYmxlIGVxICJXRUJLSVRfU09VUkNFIjsKICAgICAgICAgfQogCiAg ICAgICAgIGlmICgkcmVzdGFydE5lZWRlZCkgewpAQCAtMTY4NSwxNSArMTY5NCwzMyBAQCBzdWIg c2V0dXBBcHBsZVdpbkVudigpCiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAo ISRFTlZ7J1dFQktJVExJQlJBUklFU0RJUid9KSB7CisgICAgICAgICAgICAjIFZTMjAwNSBWZXJz aW9uLiAgVGhpcyB3aWxsIGdvIGF3YXkgaW4gYSBmdXR1cmUgY29tbWl0LgogICAgICAgICAgICAg cHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0IHNldCB0aGUgJ1dlYktpdExpYnJhcmllc0RpcicgZW52 aXJvbm1lbnQgdmFyaWFibGVcbiI7CiAgICAgICAgICAgICBwcmludCAiICAgICAgICAgdG8gYmUg YWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRpby5cbiI7CiAgICAgICAg ICAgICBwcmludCAiICAgICAgICAgTWFrZSBzdXJlIHRoYXQgJ1dlYktpdExpYnJhcmllc0Rpcicg cG9pbnRzIHRvIHRoZVxuIjsKICAgICAgICAgICAgIHByaW50ICIgICAgICAgICAnV2ViS2l0TGli cmFyaWVzL3dpbicgZGlyZWN0b3J5LCBub3QgdGhlICdXZWJLaXRMaWJyYXJpZXMvJyBkaXJlY3Rv cnkuXG5cbiI7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCEkRU5WeydXRUJLSVRfTElCUkFSSUVT J30pIHsKKyAgICAgICAgICAgICMgTmV3IFZTMjAxMCBzdXBwb3J0LiBXaWxsIHJlcGxhY2UgVlMy MDA1IHZlcnNpb24gaW4gdGhlIGZ1dHVyZS4KKyAgICAgICAgICAgIHByaW50ICJXYXJuaW5nOiBZ b3UgbXVzdCBzZXQgdGhlICdXZWJLaXRfTGlicmFyaWVzJyBlbnZpcm9ubWVudCB2YXJpYWJsZVxu IjsKKyAgICAgICAgICAgIHByaW50ICIgICAgICAgICB0byBiZSBhYmxlIGJ1aWxkIFdlYktpdCBm cm9tIHdpdGhpbiBWaXN1YWwgU3R1ZGlvLlxuIjsKKyAgICAgICAgICAgIHByaW50ICIgICAgICAg ICBNYWtlIHN1cmUgdGhhdCAnV2ViS2l0X0xpYnJhcmllcycgcG9pbnRzIHRvIHRoZVxuIjsKKyAg ICAgICAgICAgIHByaW50ICIgICAgICAgICAnV2ViS2l0TGlicmFyaWVzL3dpbicgZGlyZWN0b3J5 LCBub3QgdGhlICdXZWJLaXRMaWJyYXJpZXMvJyBkaXJlY3RvcnkuXG5cbiI7CisgICAgICAgIH0K ICAgICAgICAgaWYgKCEkRU5WeydXRUJLSVRPVVRQVVRESVInfSkgeworICAgICAgICAgICAgIyBW UzIwMDUgVmVyc2lvbi4gIFRoaXMgd2lsbCBnbyBhd2F5IGluIGEgZnV0dXJlIGNvbW1pdC4KICAg ICAgICAgICAgIHByaW50ICJXYXJuaW5nOiBZb3UgbXVzdCBzZXQgdGhlICdXZWJLaXRPdXRwdXRE aXInIGVudmlyb25tZW50IHZhcmlhYmxlXG4iOwogICAgICAgICAgICAgcHJpbnQgIiAgICAgICAg IHRvIGJlIGFibGUgYnVpbGQgV2ViS2l0IGZyb20gd2l0aGluIFZpc3VhbCBTdHVkaW8uXG5cbiI7 CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCEkRU5WeydXRUJLSVRfT1VUUFVURElSJ30pIHsKKyAg ICAgICAgICAgICMgTmV3IFZTMjAxMCBzdXBwb3J0LiBXaWxsIHJlcGxhY2UgVlMyMDA1IHZlcnNp b24gaW4gdGhlIGZ1dHVyZS4KKyAgICAgICAgICAgIHByaW50ICJXYXJuaW5nOiBZb3UgbXVzdCBz ZXQgdGhlICdXZWJLaXRfT3V0cHV0RGlyJyBlbnZpcm9ubWVudCB2YXJpYWJsZVxuIjsKKyAgICAg ICAgICAgIHByaW50ICIgICAgICAgICB0byBiZSBhYmxlIGJ1aWxkIFdlYktpdCBmcm9tIHdpdGhp biBWaXN1YWwgU3R1ZGlvLlxuXG4iOworICAgICAgICB9CisgICAgICAgIGlmICghJEVOVnsnV0VC S0lUX1NPVVJDRSd9KSB7CisgICAgICAgICAgICBwcmludCAiV2FybmluZzogWW91IG11c3Qgc2V0 IHRoZSAnV2ViS2l0X1NvdXJjZScgZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7CisgICAgICAgICAg ICBwcmludCAiICAgICAgICAgdG8gYmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlz dWFsIFN0dWRpby5cblxuIjsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtMTc0NCwxMCArMTc3 MSwxNiBAQCBzdWIgc2V0dXBDeWd3aW5FbnYoKQogICAgICAgICAkRU5WeydXRUJLSVRMSUJSQVJJ RVNESVInfSA9IEZpbGU6OlNwZWMtPmNhdGRpcigkc291cmNlRGlyLCAiV2ViS2l0TGlicmFyaWVz IiwgIndpbiIpOwogICAgICAgICBjaG9tcCgkRU5We1dFQktJVExJQlJBUklFU0RJUn0gPSBgY3ln cGF0aCAtd2EgJyRFTlZ7V0VCS0lUTElCUkFSSUVTRElSfSdgKSBpZiBpc0N5Z3dpbigpOwogICAg IH0KKyAgICB1bmxlc3MgKCRFTlZ7V0VCS0lUX0xJQlJBUklFU30pIHsKKyAgICAgICAgJEVOVnsn V0VCS0lUX0xJQlJBUklFUyd9ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRzb3VyY2VEaXIsICJXZWJL aXRMaWJyYXJpZXMiLCAid2luIik7CisgICAgICAgIGNob21wKCRFTlZ7V0VCS0lUX0xJQlJBUklF U30gPSBgY3lncGF0aCAtd2EgJyRFTlZ7V0VCS0lUX0xJQlJBUklFU30nYCkgaWYgaXNDeWd3aW4o KTsKKyAgICB9CiAKICAgICBwcmludCAiQnVpbGRpbmcgcmVzdWx0cyBpbnRvOiAiLCBiYXNlUHJv ZHVjdERpcigpLCAiXG4iOwogICAgIHByaW50ICJXRUJLSVRPVVRQVVRESVIgaXMgc2V0IHRvOiAi LCAkRU5WeyJXRUJLSVRPVVRQVVRESVIifSwgIlxuIjsKKyAgICBwcmludCAiV0VCS0lUX09VVFBV VERJUiBpcyBzZXQgdG86ICIsICRFTlZ7IldFQktJVF9PVVRQVVRESVIifSwgIlxuIjsKICAgICBw cmludCAiV0VCS0lUTElCUkFSSUVTRElSIGlzIHNldCB0bzogIiwgJEVOVnsiV0VCS0lUTElCUkFS SUVTRElSIn0sICJcbiI7CisgICAgcHJpbnQgIldFQktJVF9MSUJSQVJJRVMgaXMgc2V0IHRvOiAi LCAkRU5WeyJXRUJLSVRfTElCUkFSSUVTIn0sICJcbiI7CiB9CiAKIHN1YiBkaWVJZldpbmRvd3NQ bGF0Zm9ybVNES05vdEluc3RhbGxlZAo= 187647 2013-02-11 13:11:57 -0800 2013-02-12 11:50:52 -0800 Patch bug-107714-20130211130828.patch text/plain 6480 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0MjQ5OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDEzLTAyLTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1Ad2Via2l0Lm9y Zz4KKworICAgICAgICBVcGRhdGUgV2ViS2l0RGlycy5wbSBmb3IgbmV3IFdpbmRvd3MgcGF0aHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzcxNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOiBGb3IgZWFjaCBleGlzdGluZyBXaW5kb3dzIGVudmlyb25tZW50Cisg ICAgICAgIHZhcmlhYmxlLCBhbHNvIGluY2x1ZGUgY3JlYXRpb24gb2YgdGhlICduZXcnIHZhcmlh Ymxlcy4gVGhlCisgICAgICAgICdvbGQnIHZhcmlhYmxlcyB3aWxsIGJlIHJlbW92ZWQgaW4gYSBm dXR1cmUgdXBkYXRlLgorICAgICAgICAod2luZG93c1NvdXJjZVNvdXJjZURpcik6IE5ldyBoZWxw ZXIgcm91dGluZSB0byByZXR1cm4gdGhlCisgICAgICAgIGFjdHVhbCAnU291cmNlJyBmb2xkZXIg b2YgdGhlIFdlYktpdCBzb3VyY2UgdHJlZS4KKwogMjAxMy0wMi0xMSAgVG9ueSBDaGFuZyAgPHRv bnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1vdmUgc2V0RnJhbWVGbGF0dGVuaW5nRW5hYmxl ZCBmcm9tIGxheW91dFRlc3RDb250cm9sbGVyIHRvIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3MK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE0MjQ5OSkKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTg3LDcgKzE4Nyw3IEBAIHN1YiBkZXRl cm1pbmVCYXNlUHJvZHVjdERpcgogICAgIGRldGVybWluZVNvdXJjZURpcigpOwogCiAgICAgbXkg JHNldFNoYXJlZFByZWNvbXBzRGlyOwotICAgICRiYXNlUHJvZHVjdERpciA9ICRFTlZ7IldFQktJ VE9VVFBVVERJUiJ9OworICAgICRiYXNlUHJvZHVjdERpciA9ICRFTlZ7IldFQktJVE9VVFBVVERJ UiJ9OyAjIEZJWE1FOiBTd2l0Y2ggdG8gV0VCS0lUX09VVFBVVERJUiBhcyBwYXJ0IG9mIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk0NzIKIAogICAgIGlmICghZGVm aW5lZCgkYmFzZVByb2R1Y3REaXIpIGFuZCBpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAg IyBTaWxlbnRseSByZW1vdmUgfi9MaWJyYXJ5L1ByZWZlcmVuY2VzL3hjb2RlYnVpbGQucGxpc3Qg d2hpY2ggY2FuCkBAIC0yNjAsNiArMjYwLDcgQEAgc3ViIGRldGVybWluZUJhc2VQcm9kdWN0RGly CiAgICAgICAgIG15ICRkb3NCdWlsZFBhdGggPSBgY3lncGF0aCAtLXdpbmRvd3MgXCIkYmFzZVBy b2R1Y3REaXJcImA7CiAgICAgICAgIGNob21wICRkb3NCdWlsZFBhdGg7CiAgICAgICAgICRFTlZ7 IldFQktJVE9VVFBVVERJUiJ9ID0gJGRvc0J1aWxkUGF0aDsKKyAgICAgICAgJEVOVnsiV0VCS0lU X09VVFBVVERJUiJ9ID0gJGRvc0J1aWxkUGF0aDsKICAgICAgICAgbXkgJHVuaXhCdWlsZFBhdGgg PSBgY3lncGF0aCAtLXVuaXggXCIkYmFzZVByb2R1Y3REaXJcImA7CiAgICAgICAgIGNob21wICR1 bml4QnVpbGRQYXRoOwogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSAkdW5peEJ1aWxkUGF0aDsK QEAgLTE2NDMsNiArMTY0NCwxMSBAQCBzdWIgd2luZG93c1NvdXJjZURpcigpCiAgICAgcmV0dXJu ICR3aW5kb3dzU291cmNlRGlyOwogfQogCitzdWIgd2luZG93c1NvdXJjZVNvdXJjZURpcigpCit7 CisgICAgcmV0dXJuIHdpbmRvd3NTb3VyY2VEaXIoKSAuICJcXFNvdXJjZSI7Cit9CisKIHN1YiB3 aW5kb3dzTGlicmFyaWVzRGlyKCkKIHsKICAgICByZXR1cm4gd2luZG93c1NvdXJjZURpcigpIC4g IlxcV2ViS2l0TGlicmFyaWVzXFx3aW4iOwpAQCAtMTY3MywxMiArMTY3OSwxNSBAQCBzdWIgc2V0 dXBBcHBsZVdpbkVudigpCiAgICAgICAgIAogICAgICAgICAjIFRob3NlIGVudmlyb25tZW50IHZh cmlhYmxlcyBtdXN0IGJlIHNldCB0byBiZSBhYmxlIHRvIGJ1aWxkIGluc2lkZSBWaXN1YWwgU3R1 ZGlvLgogICAgICAgICAkdmFyaWFibGVzVG9TZXR7V0VCS0lUTElCUkFSSUVTRElSfSA9IHdpbmRv d3NMaWJyYXJpZXNEaXIoKSB1bmxlc3MgJEVOVntXRUJLSVRMSUJSQVJJRVNESVJ9OworICAgICAg ICAkdmFyaWFibGVzVG9TZXR7V0VCS0lUX0xJQlJBUklFU30gPSB3aW5kb3dzTGlicmFyaWVzRGly KCkgdW5sZXNzICRFTlZ7V0VCS0lUX0xJQlJBUklFU307CiAgICAgICAgICR2YXJpYWJsZXNUb1Nl dHtXRUJLSVRPVVRQVVRESVJ9ID0gd2luZG93c091dHB1dERpcigpIHVubGVzcyAkRU5We1dFQktJ VE9VVFBVVERJUn07CisgICAgICAgICR2YXJpYWJsZXNUb1NldHtXRUJLSVRfT1VUUFVURElSfSA9 IHdpbmRvd3NPdXRwdXREaXIoKSB1bmxlc3MgJEVOVntXRUJLSVRfT1VUUFVURElSfTsKKyAgICAg ICAgJHZhcmlhYmxlc1RvU2V0e1dFQktJVF9TT1VSQ0V9ID0gd2luZG93c1NvdXJjZVNvdXJjZURp cigpIHVubGVzcyAkRU5We1dFQktJVF9TT1VSQ0V9OwogCiAgICAgICAgIGZvcmVhY2ggbXkgJHZh cmlhYmxlIChrZXlzICV2YXJpYWJsZXNUb1NldCkgewogICAgICAgICAgICAgcHJpbnQgIlNldHRp bmcgdGhlIEVudmlyb25tZW50IFZhcmlhYmxlICciIC4gJHZhcmlhYmxlIC4gIicgdG8gJyIgLiAk dmFyaWFibGVzVG9TZXR7JHZhcmlhYmxlfSAuICInXG5cbiI7CiAgICAgICAgICAgICBzeXN0ZW0g cXcocmVndG9vbCAtcyBzZXQpLCAnXFxIS0VZX0NVUlJFTlRfVVNFUlxcRW52aXJvbm1lbnRcXCcg LiAkdmFyaWFibGUsICR2YXJpYWJsZXNUb1NldHskdmFyaWFibGV9OwotICAgICAgICAgICAgJHJl c3RhcnROZWVkZWQgfHw9ICR2YXJpYWJsZSBlcSAiV0VCS0lUTElCUkFSSUVTRElSIiB8fCAkdmFy aWFibGUgZXEgIldFQktJVE9VVFBVVERJUiI7CisgICAgICAgICAgICAkcmVzdGFydE5lZWRlZCB8 fD0gJHZhcmlhYmxlIGVxICJXRUJLSVRMSUJSQVJJRVNESVIiIHx8ICR2YXJpYWJsZSBlcSAiV0VC S0lUT1VUUFVURElSIiB8fCAkdmFyaWFibGUgZXEgIldFQktJVF9MSUJSQVJJRVMiIHx8ICR2YXJp YWJsZSBlcSAiV0VCS0lUX09VVFBVVERJUiIgfHwgJHZhcmlhYmxlIGVxICJXRUJLSVRfU09VUkNF IjsKICAgICAgICAgfQogCiAgICAgICAgIGlmICgkcmVzdGFydE5lZWRlZCkgewpAQCAtMTY4Niwx NSArMTY5NSwzNSBAQCBzdWIgc2V0dXBBcHBsZVdpbkVudigpCiAgICAgICAgIH0KICAgICB9IGVs c2UgewogICAgICAgICBpZiAoISRFTlZ7J1dFQktJVExJQlJBUklFU0RJUid9KSB7CisgICAgICAg ICAgICAjIFZTMjAwNSB2ZXJzaW9uLiAgVGhpcyB3aWxsIGJlIHJlbW92ZWQgYXMgcGFydCBvZiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NDcyLgogICAgICAgICAg ICAgcHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0IHNldCB0aGUgJ1dlYktpdExpYnJhcmllc0Rpcicg ZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7CiAgICAgICAgICAgICBwcmludCAiICAgICAgICAgdG8g YmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRpby5cbiI7CiAgICAg ICAgICAgICBwcmludCAiICAgICAgICAgTWFrZSBzdXJlIHRoYXQgJ1dlYktpdExpYnJhcmllc0Rp cicgcG9pbnRzIHRvIHRoZVxuIjsKICAgICAgICAgICAgIHByaW50ICIgICAgICAgICAnV2ViS2l0 TGlicmFyaWVzL3dpbicgZGlyZWN0b3J5LCBub3QgdGhlICdXZWJLaXRMaWJyYXJpZXMvJyBkaXJl Y3RvcnkuXG5cbiI7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCEkRU5WeydXRUJLSVRfTElCUkFS SUVTJ30pIHsKKyAgICAgICAgICAgICMgVlMyMDEwIChhbmQgbmV3ZXIpIHZlcnNpb24uIFRoaXMg d2lsbCByZXBsYWNlIHRoZSBWUzIwMDUgdmVyc2lvbiBhcyBwYXJ0IG9mCisgICAgICAgICAgICAj IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk0NzIuIAorICAgICAg ICAgICAgcHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0IHNldCB0aGUgJ1dlYktpdF9MaWJyYXJpZXMn IGVudmlyb25tZW50IHZhcmlhYmxlXG4iOworICAgICAgICAgICAgcHJpbnQgIiAgICAgICAgIHRv IGJlIGFibGUgYnVpbGQgV2ViS2l0IGZyb20gd2l0aGluIFZpc3VhbCBTdHVkaW8gMjAxMCBhbmQg bmV3ZXIuXG4iOworICAgICAgICAgICAgcHJpbnQgIiAgICAgICAgIE1ha2Ugc3VyZSB0aGF0ICdX ZWJLaXRfTGlicmFyaWVzJyBwb2ludHMgdG8gdGhlXG4iOworICAgICAgICAgICAgcHJpbnQgIiAg ICAgICAgICdXZWJLaXRMaWJyYXJpZXMvd2luJyBkaXJlY3RvcnksIG5vdCB0aGUgJ1dlYktpdExp YnJhcmllcy8nIGRpcmVjdG9yeS5cblxuIjsKKyAgICAgICAgfQogICAgICAgICBpZiAoISRFTlZ7 J1dFQktJVE9VVFBVVERJUid9KSB7CisgICAgICAgICAgICAjIFZTMjAwNSB2ZXJzaW9uLiAgVGhp cyB3aWxsIGJlIHJlbW92ZWQgYXMgcGFydCBvZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5NDcyLgogICAgICAgICAgICAgcHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0 IHNldCB0aGUgJ1dlYktpdE91dHB1dERpcicgZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7CiAgICAg ICAgICAgICBwcmludCAiICAgICAgICAgdG8gYmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRo aW4gVmlzdWFsIFN0dWRpby5cblxuIjsKICAgICAgICAgfQorICAgICAgICBpZiAoISRFTlZ7J1dF QktJVF9PVVRQVVRESVInfSkgeworICAgICAgICAgICAgIyBWUzIwMTAgKGFuZCBuZXdlcikgdmVy c2lvbi4gVGhpcyB3aWxsIHJlcGxhY2UgdGhlIFZTMjAwNSB2ZXJzaW9uIGFzIHBhcnQgb2YKKyAg ICAgICAgICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQ3 Mi4gCisgICAgICAgICAgICBwcmludCAiV2FybmluZzogWW91IG11c3Qgc2V0IHRoZSAnV2ViS2l0 X091dHB1dERpcicgZW52aXJvbm1lbnQgdmFyaWFibGVcbiI7CisgICAgICAgICAgICBwcmludCAi ICAgICAgICAgdG8gYmUgYWJsZSBidWlsZCBXZWJLaXQgZnJvbSB3aXRoaW4gVmlzdWFsIFN0dWRp byAyMDEwIGFuZCBuZXdlci5cblxuIjsKKyAgICAgICAgfQorICAgICAgICBpZiAoISRFTlZ7J1dF QktJVF9TT1VSQ0UnfSkgeworICAgICAgICAgICAgcHJpbnQgIldhcm5pbmc6IFlvdSBtdXN0IHNl dCB0aGUgJ1dlYktpdF9Tb3VyY2UnIGVudmlyb25tZW50IHZhcmlhYmxlXG4iOworICAgICAgICAg ICAgcHJpbnQgIiAgICAgICAgIHRvIGJlIGFibGUgYnVpbGQgV2ViS2l0IGZyb20gd2l0aGluIFZp c3VhbCBTdHVkaW8gMjAxMCBhbmQgbmV3ZXIuXG5cbiI7CisgICAgICAgIH0KICAgICB9CiB9CiAK QEAgLTE3NDUsMTAgKzE3NzQsMTYgQEAgc3ViIHNldHVwQ3lnd2luRW52KCkKICAgICAgICAgJEVO VnsnV0VCS0lUTElCUkFSSUVTRElSJ30gPSBGaWxlOjpTcGVjLT5jYXRkaXIoJHNvdXJjZURpciwg IldlYktpdExpYnJhcmllcyIsICJ3aW4iKTsKICAgICAgICAgY2hvbXAoJEVOVntXRUJLSVRMSUJS QVJJRVNESVJ9ID0gYGN5Z3BhdGggLXdhICckRU5We1dFQktJVExJQlJBUklFU0RJUn0nYCkgaWYg aXNDeWd3aW4oKTsKICAgICB9CisgICAgdW5sZXNzICgkRU5We1dFQktJVF9MSUJSQVJJRVN9KSB7 CisgICAgICAgICRFTlZ7J1dFQktJVF9MSUJSQVJJRVMnfSA9IEZpbGU6OlNwZWMtPmNhdGRpcigk c291cmNlRGlyLCAiV2ViS2l0TGlicmFyaWVzIiwgIndpbiIpOworICAgICAgICBjaG9tcCgkRU5W e1dFQktJVF9MSUJSQVJJRVN9ID0gYGN5Z3BhdGggLXdhICckRU5We1dFQktJVF9MSUJSQVJJRVN9 J2ApIGlmIGlzQ3lnd2luKCk7CisgICAgfQogCiAgICAgcHJpbnQgIkJ1aWxkaW5nIHJlc3VsdHMg aW50bzogIiwgYmFzZVByb2R1Y3REaXIoKSwgIlxuIjsKICAgICBwcmludCAiV0VCS0lUT1VUUFVU RElSIGlzIHNldCB0bzogIiwgJEVOVnsiV0VCS0lUT1VUUFVURElSIn0sICJcbiI7CisgICAgcHJp bnQgIldFQktJVF9PVVRQVVRESVIgaXMgc2V0IHRvOiAiLCAkRU5WeyJXRUJLSVRfT1VUUFVURElS In0sICJcbiI7CiAgICAgcHJpbnQgIldFQktJVExJQlJBUklFU0RJUiBpcyBzZXQgdG86ICIsICRF TlZ7IldFQktJVExJQlJBUklFU0RJUiJ9LCAiXG4iOworICAgIHByaW50ICJXRUJLSVRfTElCUkFS SUVTIGlzIHNldCB0bzogIiwgJEVOVnsiV0VCS0lUX0xJQlJBUklFUyJ9LCAiXG4iOwogfQogCiBz dWIgZGllSWZXaW5kb3dzUGxhdGZvcm1TREtOb3RJbnN0YWxsZWQK