118851 2013-07-18 08:23:21 -0700 Add extract-localizable-js-strings and use it for WebInspectorUI 2013-07-18 15:17:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 timothy timothy darin ddkilzer graouts joepeck oldest_to_newest 909755 0 timothy 2013-07-18 08:23:21 -0700 Update update-webkit-localizable-strings to use extract-localizable-js-strings for the WebInspectorUI strings. 909756 1 206992 timothy 2013-07-18 08:27:05 -0700 Created attachment 206992 Patch 909802 2 206992 joepeck 2013-07-18 10:59:39 -0700 Comment on attachment 206992 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206992&action=review r=me > Tools/Scripts/extract-localizable-js-strings:59 > + $file =~ s-^./--; I have never seen "-" used as the s/// delimiter. It is kind of confusing. Typically I see / or | used. Also, is this trying to detect a literal '.' or a single character directory? Seems like this should be $file =~ s|^\./||; > Tools/Scripts/extract-localizable-strings:46 > +no warnings 'deprecated'; Why is this needed and not needed before? > Tools/Scripts/update-webkit-localizable-strings:42 > +my $webInspectorUIFileToUpdate = "../OpenSource/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js"; I suspect the "../OpenSource/" part of this path should be removed. 909803 3 timothy 2013-07-18 11:06:16 -0700 (In reply to comment #2) > (From update of attachment 206992 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206992&action=review > > r=me > > > Tools/Scripts/extract-localizable-js-strings:59 > > + $file =~ s-^./--; > > I have never seen "-" used as the s/// delimiter. It is kind of confusing. Typically I see / or | used. > > Also, is this trying to detect a literal '.' or a single character directory? Seems like this should be > > $file =~ s|^\./||; Matches extract-localizable-strings and works, so I'll keep it as-is. > > Tools/Scripts/extract-localizable-strings:46 > > +no warnings 'deprecated'; > > Why is this needed and not needed before? Prevents error spew hen running update-webkit-localizable-strings that we were just tolerating. So I did this drive-by fix. > > Tools/Scripts/update-webkit-localizable-strings:42 > > +my $webInspectorUIFileToUpdate = "../OpenSource/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js"; > > I suspect the "../OpenSource/" part of this path should be removed. Yep, fixed. 909891 4 timothy 2013-07-18 15:17:01 -0700 http://trac.webkit.org/changeset/152870 206992 2013-07-18 08:27:05 -0700 2013-07-18 10:59:39 -0700 Patch bug-118851-20130718112704.patch text/plain 9375 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNTkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTcwMzkxMTg3ZTQxOTg3M2I2ZWU1MjZlZjE3OTVlYWMw NmUyODQ0ZS4uY2NmMTA0N2UyZjE3NjQzYzYxMDU4ZWFiNDBlZmIzMjc4NWI0NjNhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEzLTA3LTE4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwor ICAgICAgICBBZGQgZXh0cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzIGFuZCB1c2UgaXQgZm9y IFdlYkluc3BlY3RvclVJLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTg4NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzOiBBZGRl ZC4KKyAgICAgICAgKiBTY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtc3RyaW5nczogRGlzYWJs ZSBkZXByZWNhdGVkIHdhcm5pbmdzIGFib3V0ICJnb3RvIi4KKyAgICAgICAgKiBTY3JpcHRzL3Vw ZGF0ZS13ZWJraXQtbG9jYWxpemFibGUtc3RyaW5nczogVXNlIGV4dHJhY3QtbG9jYWxpemFibGUt anMtc3RyaW5ncyBmb3IKKyAgICAgICAgdGhlIFdlYkluc3BlY3RvclVJIHByb2plY3QuCisKIDIw MTMtMDctMTAgIFNlcmdpbyBDb3JyZWlhICA8c2VyZ2lvLmNvcnJlaWFAb3BlbmJvc3NhLm9yZz4K IAogICAgICAgICBIYW5kbGUgImxvYWQscHJvdmlzaW9uYWwsZmFpbGVkIiB3aXRoIHRoZSBvbl9l cnJvciBjYWxsYmFjayBvbiBFRkwgTWluaUJyb3dzZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzIGIvVG9vbHMvU2NyaXB0cy9leHRyYWN0 LWxvY2FsaXphYmxlLWpzLXN0cmluZ3MKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjc4NWVkM2Y2MzFmMzQ5OWZkMmI5 MzJmNGY2YTc3MWY0ZWNjM2RhOQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvZXh0 cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzCkBAIC0wLDAgKzEsMTU4IEBACisjIS91c3IvYmlu L3BlcmwgLXcKKworIyBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5E IElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisjIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorIyBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSCisjIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElO Qy4gT1IgSVRTIENPTlRSSUJVVE9SUworIyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisjIENPTlNFUVVFTlRJQUwg REFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisj IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUworIyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorIyBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorIyBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisjIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKwordXNlIHN0 cmljdDsKKworQEFSR1YgPj0gMSBvciBkaWUgIlVzYWdlOiBleHRyYWN0LWxvY2FsaXphYmxlLWpz LXN0cmluZ3MgPGZpbGUgdG8gdXBkYXRlPiBbIGRpcmVjdG9yeS4uLiBdXG5EaWQgeW91IG1lYW4g dG8gcnVuIHVwZGF0ZS13ZWJraXQtbG9jYWxpemFibGUtc3RyaW5ncyBpbnN0ZWFkP1xuIjsKKwor bXkgJGZpbGVUb1VwZGF0ZSA9IHNoaWZ0IEBBUkdWOworLWYgJGZpbGVUb1VwZGF0ZSBvciBkaWUg IkNvdWxkbid0IGZpbmQgZmlsZSB0byB1cGRhdGUgJGZpbGVUb1VwZGF0ZVxuIjsKKworbXkgQGRp cmVjdG9yaWVzID0gKCk7CitteSBAZGlyZWN0b3JpZXNUb1NraXAgPSAoKTsKK2lmIChAQVJHViA8 IDEpIHsKKyAgICBwdXNoKEBkaXJlY3RvcmllcywgIi4iKTsKK30gZWxzZSB7CisgICAgZm9yIG15 ICRkaXIgKEBBUkdWKSB7CisgICAgICAgIGlmICgkZGlyID1+IC9eLSguKikkLykgeworICAgICAg ICAgICAgcHVzaCBAZGlyZWN0b3JpZXNUb1NraXAsICQxOworICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgcHVzaCBAZGlyZWN0b3JpZXMsICRkaXI7CisgICAgICAgIH0KKyAgICB9Cit9CisK K215ICRzYXdFcnJvciA9IDA7CisKK215ICRrZXlDb2xsaXNpb25Db3VudCA9IDA7CisKK215ICRx dW90ZWREaXJlY3Rvcmllc1N0cmluZyA9ICciJyAuIGpvaW4oJyIgIicsIEBkaXJlY3Rvcmllcykg LiAnIic7Citmb3IgbXkgJGRpciAoQGRpcmVjdG9yaWVzVG9Ta2lwKSB7CisgICAgJHF1b3RlZERp cmVjdG9yaWVzU3RyaW5nIC49ICcgLXBhdGggIicgLiAkZGlyIC4gJyIgLXBydW5lIC1vJzsKK30K KworbXkgQGZpbGVzID0gKCBzcGxpdCAiXG4iLCBgZmluZCAkcXVvdGVkRGlyZWN0b3JpZXNTdHJp bmcgXFwoIC1uYW1lICIqLmh0bWwiIC1vIC1uYW1lICIqLmpzIiBcXClgICk7CisKK2ZvciBteSAk ZmlsZSAoc29ydCBAZmlsZXMpIHsKKyAgICAkZmlsZSA9fiBzLV4uLy0tOworCisgICAgb3BlbiBT T1VSQ0UsICRmaWxlIG9yIGRpZSAiY2FuJ3Qgb3BlbiAkZmlsZVxuIjsKKworICAgIHdoaWxlICg8 U09VUkNFPikgeworICAgICAgICBjaG9tcDsKKworICAgICAgICAjIEhhbmRsZSBXZWJJbnNwZWN0 b3Igc3RyaW5ncy4gUHJpbnRzIGEgd2FybmluZyBpZiBhIG5vbi1zdHJpbmcgbGl0ZXJhbCBpcyBw YXNzZWQgdG8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCkuCisgICAgICAgIEhhbmRsZVVJU3RyaW5n KCQxLCAkMSwgIiIsICRmaWxlLCAkLikgd2hpbGUgcy9XZWJJbnNwZWN0b3JcLlVJU3RyaW5nXCgi KFteIl0rKSJcKS8vOworICAgICAgICBwcmludCAiJGZpbGU6JC46V0FSTklORzogJCZcbiIgd2hp bGUgcy9XZWJJbnNwZWN0b3JcLlVJU3RyaW5nXCguKj9cKS8vOworCisgICAgICAgICMgSGFuZGxl IHN0cmluZ3MgZm9yIG90aGVyIHByb2plY3RzIHRoYXQgYWxzbyB1c2UgdGhpcyBzY3JpcHQuCisg ICAgICAgIEhhbmRsZVVJU3RyaW5nKCQyLCAkMiwgIiIsICRmaWxlLCAkLikgd2hpbGUgcy8oXGJj bGFzcz0iW14iXSpsMTJuLXRvb2x0aXBbXiJdKiJbXj5dKil0aXRsZT0iKFteIl0rKSIvJDEvOwor ICAgICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAkZmlsZSwgJC4pIHdoaWxlIHMvXGJ0 aXRsZT0iKFteIl0rKSIoW14+XSpjbGFzcz0iW14iXSpsMTJuLXRvb2x0aXBbXiJdKiIpLyQyLzsK KyAgICAgICAgSGFuZGxlVUlTdHJpbmcoJDIsICQyLCAiIiwgJGZpbGUsICQuKSB3aGlsZSBzLzwo XHcrKVtePl0qXGJjbGFzcz0iW14iXSpsMTJuW14iXSoiW14+XSo+KFtePl0rKTxcL1wxPi8vOwor ICAgICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAkZmlsZSwgJC4pIHdoaWxlIHMvSFRN TFZpZXdDb250cm9sbGVyXC5VSVN0cmluZ1woIihbXiJdKykiXCkvLzsKKyAgICAgICAgSGFuZGxl VUlTdHJpbmcoJDEsICQxLCAiIiwgJGZpbGUsICQuKSB3aGlsZSBzL1xiZ2V0TG9jYWxpemVkU3Ry aW5nXCgiKFteIl0rKSJcKS8vOworICAgICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAk ZmlsZSwgJC4pIHdoaWxlIHMvXGJsb2NhbGl6ZWRTdHJpbmdzXFsiKFteIl0rKSJcXS8vOworICAg IH0KKworICAgIGNsb3NlIFNPVVJDRTsKK30KKworbXkgJXN0cmluZ0J5S2V5OworbXkgJWNvbW1l bnRCeUtleTsKK215ICVmaWxlQnlLZXk7CitteSAlbGluZUJ5S2V5OworCitzdWIgSGFuZGxlVUlT dHJpbmcKK3sKKyAgICBteSAoJHN0cmluZywgJGtleSwgJGNvbW1lbnQsICRmaWxlLCAkbGluZSkg PSBAXzsKKyAgICBteSAkYmFkID0gMDsKKworICAgIGlmIChncmVwIHsgJF8gPT0gMHhGRkZEIH0g dW5wYWNrICJVKiIsICRzdHJpbmcpIHsKKyAgICAgICAgcHJpbnQgIiRmaWxlOiRsaW5lOkVSUk9S OnN0cmluZyBmb3IgdHJhbnNsYXRpb24gaGFzIGlsbGVnYWwgVVRGLTggLS0gbW9zdCBsaWtlbHkg YSBwcm9ibGVtIHdpdGggdGhlIFRleHQgRW5jb2Rpbmcgb2YgdGhlIHNvdXJjZSBmaWxlXG4iOwor ICAgICAgICAkYmFkID0gMTsKKyAgICB9CisKKyAgICBpZiAoJHN0cmluZyBuZSAka2V5ICYmIGdy ZXAgeyAkXyA9PSAweEZGRkQgfSB1bnBhY2sgIlUqIiwgJGtleSkgeworICAgICAgICBwcmludCAi JGZpbGU6JGxpbmU6RVJST1I6a2V5IGhhcyBpbGxlZ2FsIFVURi04IC0tIG1vc3QgbGlrZWx5IGEg cHJvYmxlbSB3aXRoIHRoZSBUZXh0IEVuY29kaW5nIG9mIHRoZSBzb3VyY2UgZmlsZVxuIjsKKyAg ICAgICAgJGJhZCA9IDE7CisgICAgfQorCisgICAgaWYgKGdyZXAgeyAkXyA9PSAweEZGRkQgfSB1 bnBhY2sgIlUqIiwgJGNvbW1lbnQpIHsKKyAgICAgICAgcHJpbnQgIiRmaWxlOiRsaW5lOkVSUk9S OmNvbW1lbnQgZm9yIHRyYW5zbGF0aW9uIGhhcyBpbGxlZ2FsIFVURi04IC0tIG1vc3QgbGlrZWx5 IGEgcHJvYmxlbSB3aXRoIHRoZSBUZXh0IEVuY29kaW5nIG9mIHRoZSBzb3VyY2UgZmlsZVxuIjsK KyAgICAgICAgJGJhZCA9IDE7CisgICAgfQorCisgICAgaWYgKCRiYWQpIHsKKyAgICAgICAgJHNh d0Vycm9yID0gMTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmICgkc3RyaW5nQnlL ZXl7JGtleX0gJiYgJHN0cmluZ0J5S2V5eyRrZXl9IG5lICRzdHJpbmcpIHsKKyAgICAgICAgcHJp bnQgIiRmaWxlOiRsaW5lOmVuY291bnRlcmVkIHRoZSBzYW1lIGtleSwgXCIka2V5XCIsIHR3aWNl LCB3aXRoIGRpZmZlcmVudCBzdHJpbmdzXG4iOworICAgICAgICBwcmludCAiJGZpbGVCeUtleXsk a2V5fTokbGluZUJ5S2V5eyRrZXl9OnByZXZpb3VzIG9jY3VycmVuY2VcbiI7CisgICAgICAgICRr ZXlDb2xsaXNpb25Db3VudCsrOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKCRj b21tZW50QnlLZXl7JGtleX0gJiYgJGNvbW1lbnRCeUtleXska2V5fSBuZSAkY29tbWVudCkgewor ICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6ZW5jb3VudGVyZWQgdGhlIHNhbWUga2V5LCBcIiRr ZXlcIiwgdHdpY2UsIHdpdGggZGlmZmVyZW50IGNvbW1lbnRzXG4iOworICAgICAgICBwcmludCAi JGZpbGVCeUtleXska2V5fTokbGluZUJ5S2V5eyRrZXl9OnByZXZpb3VzIG9jY3VycmVuY2VcbiI7 CisgICAgICAgICRrZXlDb2xsaXNpb25Db3VudCsrOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgJGZpbGVCeUtleXska2V5fSA9ICRmaWxlOworICAgICRsaW5lQnlLZXl7JGtleX0gPSAk bGluZTsKKyAgICAkc3RyaW5nQnlLZXl7JGtleX0gPSAkc3RyaW5nOworICAgICRjb21tZW50QnlL ZXl7JGtleX0gPSAkY29tbWVudDsKK30KKworcHJpbnQgIlxuIiBpZiAkc2F3RXJyb3I7CisKK3By aW50ICIka2V5Q29sbGlzaW9uQ291bnQga2V5IGNvbGxpc2lvbnNcbiIgaWYgJGtleUNvbGxpc2lv bkNvdW50OworCitpZiAoJHNhd0Vycm9yKSB7CisgICAgcHJpbnQgIlxuRXJyb3JzIGVuY291bnRl cmVkLiBFeGl0aW5nIHdpdGhvdXQgd3JpdGluZyB0byAkZmlsZVRvVXBkYXRlLlxuIjsKKyAgICBl eGl0IDE7Cit9CisKK215ICRsb2NhbGl6ZWRTdHJpbmdzID0gInZhciBsb2NhbGl6ZWRTdHJpbmdz ID0gbmV3IE9iamVjdDtcblxuIjsKKworZm9yIG15ICRrZXkgKHNvcnQga2V5cyAlY29tbWVudEJ5 S2V5KSB7CisgICAgJGxvY2FsaXplZFN0cmluZ3MgLj0gImxvY2FsaXplZFN0cmluZ3NbXCIka2V5 XCJdID0gXCIkc3RyaW5nQnlLZXl7JGtleX1cIjtcbiI7Cit9CisKKyMgV3JpdGUgb3V0IHRoZSBz dHJpbmdzIGZpbGUgaW4gVVRGLTE2IHdpdGggYSBCT00uCit1dGY4OjpkZWNvZGUoJGxvY2FsaXpl ZFN0cmluZ3MpIGlmICReViBnZSB2NS44OworbXkgJG91dHB1dCA9IHBhY2sgIm4qIiwgKDB4RkVG RiwgdW5wYWNrICJVKiIsICRsb2NhbGl6ZWRTdHJpbmdzKTsKKworaWYgKC1lICIkZmlsZVRvVXBk YXRlIikgeworICAgIG9wZW4gU1RSSU5HUywgIj4iLCAiJGZpbGVUb1VwZGF0ZSIgb3IgZGllOwor ICAgIHByaW50IFNUUklOR1MgJG91dHB1dDsKKyAgICBjbG9zZSBTVFJJTkdTOworfSBlbHNlIHsK KyAgICBwcmludCAiJGZpbGVUb1VwZGF0ZSBkb2VzIG5vdCBleGlzdFxuIjsKKyAgICBleGl0IDE7 Cit9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtc3RyaW5n cyBiL1Rvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzCmluZGV4IDg4ZjM2 ODQ3ODI4NWE0MjNmMmZlNTdlMTUzMzgyZDNkZGRjOTkwOTcuLjk0NmVlZWM1MGJiY2VlMmQ0Y2Uy NzA5NTYyYjA3ZDljZmE0MmQxNWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZXh0cmFjdC1s b2NhbGl6YWJsZS1zdHJpbmdzCisrKyBiL1Rvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJs ZS1zdHJpbmdzCkBAIC00Myw2ICs0Myw3IEBACiAjIFRoZSBleGNlcHRpb25zIGZpbGUgaGFzIGEg bGlzdCBvZiBzdHJpbmdzIGluIHF1b3RlcywgZmlsZW5hbWVzLCBhbmQgZmlsZW5hbWUvc3RyaW5n IHBhaXJzIHNlcGFyYXRlZCBieSA6LgogCiB1c2Ugc3RyaWN0Oworbm8gd2FybmluZ3MgJ2RlcHJl Y2F0ZWQnOwogCiBzdWIgVW5lc2NhcGVIZXhTZXF1ZW5jZSgkKTsKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxvY2FsaXphYmxlLXN0cmluZ3MgYi9Ub29scy9TY3Jp cHRzL3VwZGF0ZS13ZWJraXQtbG9jYWxpemFibGUtc3RyaW5ncwppbmRleCBjZWIyNWE1OGEzOTc0 OWQzMWY1M2FjZTQ4YjgyYjM3ZTU3MzE5OTAxLi42Mzg0NDhiNmRmNmVmNTc1YTY3NzE0YjkyNTRj MmQxYjVmMzU4MTg5IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbG9j YWxpemFibGUtc3RyaW5ncworKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbG9jYWxp emFibGUtc3RyaW5ncwpAQCAtMSw2ICsxLDYgQEAKICMhL3Vzci9iaW4vcGVybCAtdwogCi0jIENv cHlyaWdodCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgor IyBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMTMgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzUsMTEgKzM1LDE1IEBA IHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwogCiAjIFdlYktpdCBhbmQg V2ViS2l0MiBzdHJpbmdzIGdvIGludG8gV2ViQ29yZSdzIExvY2FsaXphYmxlLnN0cmluZ3MuCi1t eSBAZGlyZWN0b3JpZXNUb1NjYW4gPSAoIlNvdXJjZS9XZWJDb3JlIiwgIlNvdXJjZS9XZWJLaXQv bWFjIiwgIlNvdXJjZS9XZWJLaXQvd2luIiwgIlNvdXJjZS9XZWJLaXQyIiwgIi1Tb3VyY2UvV2Vi Q29yZS9pY3UiLCAiLVNvdXJjZS9XZWJLaXQvbWFjL2ljdSIpOwotbXkgJGZpbGVUb1VwZGF0ZSA9 ICJTb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MiOworbXkg QHdlYktpdERpcmVjdG9yaWVzVG9TY2FuID0gKCJTb3VyY2UvV2ViQ29yZSIsICJTb3VyY2UvV2Vi S2l0L21hYyIsICJTb3VyY2UvV2ViS2l0L3dpbiIsICJTb3VyY2UvV2ViS2l0MiIsICItU291cmNl L1dlYkNvcmUvaWN1IiwgIi1Tb3VyY2UvV2ViS2l0L21hYy9pY3UiKTsKK215IEB3ZWJJbnNwZWN0 b3JVSURpcmVjdG9yaWVzVG9TY2FuID0gKCJTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZSIpOworCitteSAkd2ViQ29yZUZpbGVUb1VwZGF0ZSA9ICJTb3VyY2UvV2ViQ29yZS9Fbmds aXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MiOworbXkgJHdlYkluc3BlY3RvclVJRmlsZVRv VXBkYXRlID0gIi4uL09wZW5Tb3VyY2UvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyI7CiAKIEBBUkdWID09IDAgb3IgZGllICJV c2FnZTogIiAuIGJhc2VuYW1lKCQwKSAuICJcbiI7CiAKIGNoZGlyV2ViS2l0KCk7CiAKLXN5c3Rl bSAiVG9vbHMvU2NyaXB0cy9leHRyYWN0LWxvY2FsaXphYmxlLXN0cmluZ3MiLCAiLSIsICRmaWxl VG9VcGRhdGUsIEBkaXJlY3Rvcmllc1RvU2NhbjsKK3N5c3RlbSAiVG9vbHMvU2NyaXB0cy9leHRy YWN0LWxvY2FsaXphYmxlLXN0cmluZ3MiLCAiLSIsICR3ZWJDb3JlRmlsZVRvVXBkYXRlLCBAd2Vi S2l0RGlyZWN0b3JpZXNUb1NjYW47CitzeXN0ZW0gIlRvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2Nh bGl6YWJsZS1qcy1zdHJpbmdzIiwgJHdlYkluc3BlY3RvclVJRmlsZVRvVXBkYXRlLCBAd2ViSW5z cGVjdG9yVUlEaXJlY3Rvcmllc1RvU2NhbjsK