56335 2011-03-14 14:11:25 -0700 [chromium] add a build target to create a grd file with devtool resources 2011-03-15 14:37:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony commit-queue pfeldman oldest_to_newest 367214 0 tony 2011-03-14 14:11:25 -0700 [chromium] add a build target to create a grd file with devtool resources 367218 1 85717 tony 2011-03-14 14:12:13 -0700 Created attachment 85717 Patch 367222 2 tony 2011-03-14 14:15:04 -0700 This is the webkit side of http://code.google.com/p/chromium/issues/detail?id=35793 . The next chromium side that uses this is: http://codereview.chromium.org/6685061/ In general, the plan is to put all the files in resources/inspector into resources.pak. To do that, we generate the .grd file with this script, then we run grit on the file which creates devtools.pak which we then merge (repack) into resources.pak. The chromium code will also have to be updated to load the files from resources.pak. Also, this shouldn't change anything for test_shell, DRT or for the debug mode. 367574 3 85717 abarth 2011-03-15 02:15:31 -0700 Comment on attachment 85717 Patch Crazy. The Python script is very nice. WebKit.gyp is out of control. 367764 4 tony 2011-03-15 10:41:07 -0700 Committed r81147: <http://trac.webkit.org/changeset/81147> 367779 5 tony 2011-03-15 10:57:09 -0700 Broke on Chromium Win so I reverted: http://trac.webkit.org/changeset/81152 367781 6 tony 2011-03-15 10:57:26 -0700 reopening 367914 7 85852 tony 2011-03-15 13:37:52 -0700 Created attachment 85852 Patch for landing 367953 8 85852 commit-queue 2011-03-15 14:37:21 -0700 Comment on attachment 85852 Patch for landing Clearing flags on attachment: 85852 Committed r81175: <http://trac.webkit.org/changeset/81175> 367954 9 commit-queue 2011-03-15 14:37:29 -0700 All reviewed patches have been landed. Closing bug. 85717 2011-03-14 14:12:13 -0700 2011-03-15 13:37:50 -0700 Patch bug-56335-20110314141305.patch text/plain 7271 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODEwNTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MmZhN2I0Y2Q2YzY2NGY1NmNmODhhM2VlNGY4OTY0ZjZmN2FlMTI1Yy4uMDg0YzlmMDA5OWMwMTgx Mzg4NzhhYjYwM2YyM2IxZGI5ZmU0YjIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNiBAQAorMjAxMS0wMy0xNCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJv bWl1bV0gYWRkIGEgYnVpbGQgdGFyZ2V0IHRvIGNyZWF0ZSBhIGdyZCBmaWxlIHdpdGggZGV2dG9v bCByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU2MzM1CisKKyAgICAgICAgVGhpcyBpcyB0aGUgd2Via2l0IHNpZGUgb2YgdGhlIGZpeCBm b3IKKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRh aWw/aWQ9MzU3OTMKKworICAgICAgICAqIFdlYktpdC5neXA6CisgICAgICAgICogc2NyaXB0cy9n ZW5lcmF0ZV9kZXZ0b29sc19ncmQucHk6IEFkZGVkLgorCiAyMDExLTAzLTE0ICBKb2huIEtub3R0 ZW5iZWx0ICA8amtub3R0ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFN0 ZXZlIEJsb2NrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IDFjYjY4ZjlhYmJkNmRl ZDFhZmRlZjkwNjRlZTYyZTA1MGJjYTljYjkuLjk5OGYzMDFiYjlmODU2MDBiY2Y0YWQ3OTQ5OWYz ODRkNmQwYTUzZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5 cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTc5Niw2ICs3OTYs MzUgQEAKICAgICAgICAgICAgIH1dLAogICAgICAgICB9LAogICAgICAgICB7CisgICAgICAgICAg ICAndGFyZ2V0X25hbWUnOiAnZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkJywKKyAgICAgICAgICAgICd0 eXBlJzogJ25vbmUnLAorICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKKyAgICAgICAgICAg ICAgICAnZGV2dG9vbHNfaHRtbCcsCisgICAgICAgICAgICAgICAgJ2NvbmNhdGVuYXRlZF9kZXZ0 b29sc19qcycsCisgICAgICAgICAgICAgICAgJ2NvbmNhdGVuYXRlZF9kZXZ0b29sc19jc3MnLAor ICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICdhY3Rpb25zJzogW3sKKyAgICAgICAgICAgICAg ICAnYWN0aW9uX25hbWUnOiAnZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkJywKKyAgICAgICAgICAgICAg ICAnc2NyaXB0X25hbWUnOiAnc2NyaXB0cy9nZW5lcmF0ZV9kZXZ0b29sc19ncmQucHknLAorICAg ICAgICAgICAgICAgICdpbnB1dF9wYWdlJzogWworICAgICAgICAgICAgICAgICAgICAnPChQUk9E VUNUX0RJUikvcmVzb3VyY2VzL2luc3BlY3Rvci9kZXZ0b29scy5odG1sJywKKyAgICAgICAgICAg ICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9pbnNwZWN0b3IvRGV2VG9vbHMuanMn LAorICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvcmVzb3VyY2VzL2luc3BlY3Rv ci9kZXZUb29scy5jc3MnLAorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgJ2lt YWdlcyc6IFsKKyAgICAgICAgICAgICAgICAgICAgJzxAKHdlYmluc3BlY3Rvcl9pbWFnZV9maWxl cyknLAorICAgICAgICAgICAgICAgICAgICAnPEAoZGV2dG9vbHNfaW1hZ2VfZmlsZXMpJywKKyAg ICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICdpbnB1dHMnOiBbCisgICAgICAgICAg ICAgICAgICAgICc8QChfc2NyaXB0X25hbWUpJywKKyAgICAgICAgICAgICAgICAgICAgJzxAKF9p bnB1dF9wYWdlKScsCisgICAgICAgICAgICAgICAgICAgICc8QChfaW1hZ2VzKScsCisgICAgICAg ICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAnb3V0cHV0cyc6IFsnPChTSEFSRURfSU5URVJN RURJQVRFX0RJUikvZGV2dG9vbHMvZGV2dG9vbHMuZ3JkJ10sCisgICAgICAgICAgICAgICAgJ2Fj dGlvbic6IFsncHl0aG9uJywgJzxAKF9zY3JpcHRfbmFtZSknLCAnPEAoX2lucHV0X3BhZ2UpJywg Jy0taW1hZ2VzJywgJzxAKF9pbWFnZXMpJywgJy0tb3V0cHV0JywgJzxAKF9vdXRwdXRzKSddLAor ICAgICAgICAgICAgfV0sCisgICAgICAgIH0sCisgICAgICAgIHsKICAgICAgICAgICAgICd0YXJn ZXRfbmFtZSc6ICd3ZWJraXRfdW5pdF90ZXN0cycsCiAgICAgICAgICAgICAndHlwZSc6ICdleGVj dXRhYmxlJywKICAgICAgICAgICAgICdtc3ZzX2d1aWQnOiAnN0NFRkU4MDAtODQwMy00MThBLUFE NkEtMkQ1MkM2RkMzRUFEJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc2Ny aXB0cy9nZW5lcmF0ZV9kZXZ0b29sc19ncmQucHkgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Nj cmlwdHMvZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZlNDc0OTRjOGFmZWJi N2I5OGU3OTU3YWYyNjgxOTBmN2MyMzk3YzQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NjcmlwdHMvZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkLnB5CkBAIC0wLDAgKzEs MTE1IEBACisjIS91c3IvYmluL2VudiBweXRob24KKyMKKyMgQ29weXJpZ2h0IChDKSAyMDExIEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgICAgICAq IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUK KyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICAgICAqIE5l aXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29u dHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJp dmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4g cGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJ R0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IK KyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us CisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorCisiIiJDcmVhdGVzIGEgZ3JkIGZpbGUgZm9yIHBhY2thZ2luZyB0aGUgaW5zcGVjdG9y IGZpbGVzLiIiIgorCitpbXBvcnQgZXJybm8KK2ltcG9ydCBvcworaW1wb3J0IHNodXRpbAoraW1w b3J0IHN5cworZnJvbSB4bWwuZG9tIGltcG9ydCBtaW5pZG9tCisKK2tEZXZUb29sc1Jlc291cmNl UHJlZml4ID0gJ0lEUl9ERVZUT09MU18nCitrR3JkVGVtcGxhdGUgPSAnJyc8P3htbCB2ZXJzaW9u PSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgorPGdyaXQgbGF0ZXN0X3B1YmxpY19yZWxlYXNlPSIw IiBjdXJyZW50X3JlbGVhc2U9IjEiPgorICA8b3V0cHV0cz4KKyAgICA8b3V0cHV0IGZpbGVuYW1l PSJncml0L2RldnRvb2xzX3Jlc291cmNlcy5oIiB0eXBlPSJyY19oZWFkZXIiPgorICAgICAgPGVt aXQgZW1pdF90eXBlPSdwcmVwZW5kJz48L2VtaXQ+CisgICAgPC9vdXRwdXQ+CisgICAgPG91dHB1 dCBmaWxlbmFtZT0iZ3JpdC9kZXZ0b29sc19yZXNvdXJjZXNfbWFwLmNjIiB0eXBlPSJyZXNvdXJj ZV9maWxlX21hcF9zb3VyY2UiIC8+CisgICAgPG91dHB1dCBmaWxlbmFtZT0iZ3JpdC9kZXZ0b29s c19yZXNvdXJjZXNfbWFwLmgiIHR5cGU9InJlc291cmNlX21hcF9oZWFkZXIiIC8+CisKKyAgICA8 b3V0cHV0IGZpbGVuYW1lPSJkZXZ0b29sc19yZXNvdXJjZXMucGFrIiB0eXBlPSJkYXRhX3BhY2th Z2UiIC8+CisgIDwvb3V0cHV0cz4KKyAgPHJlbGVhc2Ugc2VxPSIxIj4KKyAgICA8aW5jbHVkZXM+ PC9pbmNsdWRlcz4KKyAgPC9yZWxlYXNlPgorPC9ncml0PgorJycnCisKKworY2xhc3MgUGFyc2Vk QXJnczoKKyAgICBkZWYgX19pbml0X18oc2VsZiwgc291cmNlX2ZpbGVzLCBpbWFnZV9maWxlcywg b3V0cHV0X2ZpbGVuYW1lKToKKyAgICAgICAgc2VsZi5zb3VyY2VfZmlsZXMgPSBzb3VyY2VfZmls ZXMKKyAgICAgICAgc2VsZi5pbWFnZV9maWxlcyA9IGltYWdlX2ZpbGVzCisgICAgICAgIHNlbGYu b3V0cHV0X2ZpbGVuYW1lID0gb3V0cHV0X2ZpbGVuYW1lCisKKworZGVmIHBhcnNlX2FyZ3MoYXJn dik6CisgICAgaW1hZ2VzX3Bvc2l0aW9uID0gYXJndi5pbmRleCgnLS1pbWFnZXMnKQorICAgIG91 dHB1dF9wb3NpdGlvbiA9IGFyZ3YuaW5kZXgoJy0tb3V0cHV0JykKKyAgICBzb3VyY2VfZmlsZXMg PSBhcmd2WzppbWFnZXNfcG9zaXRpb25dCisgICAgaW1hZ2VfZmlsZXMgPSBhcmd2W2ltYWdlc19w b3NpdGlvbiArIDE6b3V0cHV0X3Bvc2l0aW9uXQorICAgIHJldHVybiBQYXJzZWRBcmdzKHNvdXJj ZV9maWxlcywgaW1hZ2VfZmlsZXMsIGFyZ3Zbb3V0cHV0X3Bvc2l0aW9uICsgMV0pCisKKworZGVm IG1ha2VfbmFtZV9mcm9tX2ZpbGVuYW1lKGZpbGVuYW1lKToKKyAgICByZXR1cm4gKGZpbGVuYW1l LnJlcGxhY2UoJy8nLCAnXycpCisgICAgICAgICAgICAgICAgICAgIC5yZXBsYWNlKCdcXCcsICdf JykKKyAgICAgICAgICAgICAgICAgICAgLnJlcGxhY2UoJy4nLCAnXycpKS51cHBlcigpCisKKwor ZGVmIGFkZF9maWxlX3RvX2dyZChncmRfZG9jLCBmaWxlbmFtZSk6CisgICAgaW5jbHVkZXNfbm9k ZSA9IGdyZF9kb2MuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ2luY2x1ZGVzJylbMF0KKyAgICBpbmNs dWRlc19ub2RlLmFwcGVuZENoaWxkKGdyZF9kb2MuY3JlYXRlVGV4dE5vZGUoJ1xuICAgICAgJykp CisKKyAgICBuZXdfaW5jbHVkZV9ub2RlID0gZ3JkX2RvYy5jcmVhdGVFbGVtZW50KCdpbmNsdWRl JykKKyAgICBuZXdfaW5jbHVkZV9ub2RlLnNldEF0dHJpYnV0ZSgnbmFtZScsIG1ha2VfbmFtZV9m cm9tX2ZpbGVuYW1lKGZpbGVuYW1lKSkKKyAgICBuZXdfaW5jbHVkZV9ub2RlLnNldEF0dHJpYnV0 ZSgnZmlsZScsIGZpbGVuYW1lKQorICAgIG5ld19pbmNsdWRlX25vZGUuc2V0QXR0cmlidXRlKCd0 eXBlJywgJ0JJTkRBVEEnKQorICAgIGluY2x1ZGVzX25vZGUuYXBwZW5kQ2hpbGQobmV3X2luY2x1 ZGVfbm9kZSkKKworCitkZWYgbWFpbihhcmd2KToKKyAgICBwYXJzZWRfYXJncyA9IHBhcnNlX2Fy Z3MoYXJndlsxOl0pCisKKyAgICBkb2MgPSBtaW5pZG9tLnBhcnNlU3RyaW5nKGtHcmRUZW1wbGF0 ZSkKKyAgICBvdXRwdXRfZGlyZWN0b3J5ID0gb3MucGF0aC5kaXJuYW1lKHBhcnNlZF9hcmdzLm91 dHB1dF9maWxlbmFtZSkKKworICAgIHRyeToKKyAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5q b2luKG91dHB1dF9kaXJlY3RvcnksICdJbWFnZXMnKSkKKyAgICBleGNlcHQgT1NFcnJvciwgZToK KyAgICAgICAgaWYgZS5lcnJubyAhPSBlcnJuby5FRVhJU1Q6CisgICAgICAgICAgICByYWlzZSBl CisKKyAgICBmb3IgZmlsZW5hbWUgaW4gcGFyc2VkX2FyZ3Muc291cmNlX2ZpbGVzOgorICAgICAg ICBzaHV0aWwuY29weShmaWxlbmFtZSwgb3V0cHV0X2RpcmVjdG9yeSkKKyAgICAgICAgYWRkX2Zp bGVfdG9fZ3JkKGRvYywgb3MucGF0aC5iYXNlbmFtZShmaWxlbmFtZSkpCisKKyAgICBmb3IgZmls ZW5hbWUgaW4gcGFyc2VkX2FyZ3MuaW1hZ2VfZmlsZXM6CisgICAgICAgIHNodXRpbC5jb3B5KGZp bGVuYW1lLCBvcy5wYXRoLmpvaW4ob3V0cHV0X2RpcmVjdG9yeSwgJ0ltYWdlcycpKQorICAgICAg ICBhZGRfZmlsZV90b19ncmQoZG9jLCBvcy5wYXRoLmpvaW4oJ0ltYWdlcycsIG9zLnBhdGguYmFz ZW5hbWUoZmlsZW5hbWUpKSkKKworICAgIHdpdGggb3BlbihwYXJzZWRfYXJncy5vdXRwdXRfZmls ZW5hbWUsICd3JykgYXMgb3V0cHV0X2ZpbGU6CisgICAgICAgIG91dHB1dF9maWxlLndyaXRlKGRv Yy50b3htbChlbmNvZGluZz0nVVRGLTgnKSkKKworCitpZiBfX25hbWVfXyA9PSAnX19tYWluX18n OgorICAgIHN5cy5leGl0KG1haW4oc3lzLmFyZ3YpKQo= 85852 2011-03-15 13:37:52 -0700 2011-03-15 14:37:21 -0700 Patch for landing bug-56335-20110315133848.patch text/plain 7586 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODExNjQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MzU5NDU3OTUxNWYxYzczN2RmOGRhZGVjZjg5YmFiNjVmNzY4M2NkMS4uMTkwODBlMGYzNWMzZjUy NDdjNWI5MTgyNTAyZDEyODljZDljMjA3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAxMS0wMy0xNSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCisKKyAgICAgICAgW2Nocm9taXVt XSBhZGQgYSBidWlsZCB0YXJnZXQgdG8gY3JlYXRlIGEgZ3JkIGZpbGUgd2l0aCBkZXZ0b29sIHJl c291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTYzMzUKKworICAgICAgICBSZWxhbmQgd2l0aCBhIGZpeCB0byBhdm9pZCByZWFsbHkgbG9uZyBj b21tYW5kIGxpbmVzIG9uIFdpbmRvd3MuCisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAg ICAqIHNjcmlwdHMvZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkLnB5OiBBZGRlZC4KKwogMjAxMS0wMy0x NSAgQnJldHQgV2lsc29uICA8YnJldHR3QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IDFjYjY4Zjlh YmJkNmRlZDFhZmRlZjkwNjRlZTYyZTA1MGJjYTljYjkuLmRkNzMxMDUyYzcwZGQyMTVhNmI1ZjRh YzhlZTI4YTg1OGVlMDA3MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTc5Niw2 ICs3OTYsMzkgQEAKICAgICAgICAgICAgIH1dLAogICAgICAgICB9LAogICAgICAgICB7CisgICAg ICAgICAgICAndGFyZ2V0X25hbWUnOiAnZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkJywKKyAgICAgICAg ICAgICd0eXBlJzogJ25vbmUnLAorICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKKyAgICAg ICAgICAgICAgICAnZGV2dG9vbHNfaHRtbCcsCisgICAgICAgICAgICAgICAgJ2NvbmNhdGVuYXRl ZF9kZXZ0b29sc19qcycsCisgICAgICAgICAgICAgICAgJ2NvbmNhdGVuYXRlZF9kZXZ0b29sc19j c3MnLAorICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICdhY3Rpb25zJzogW3sKKyAgICAgICAg ICAgICAgICAnYWN0aW9uX25hbWUnOiAnZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkJywKKyAgICAgICAg ICAgICAgICAnc2NyaXB0X25hbWUnOiAnc2NyaXB0cy9nZW5lcmF0ZV9kZXZ0b29sc19ncmQucHkn LAorICAgICAgICAgICAgICAgICdpbnB1dF9wYWdlcyc6IFsKKyAgICAgICAgICAgICAgICAgICAg JzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9pbnNwZWN0b3IvZGV2dG9vbHMuaHRtbCcsCisgICAg ICAgICAgICAgICAgICAgICc8KFBST0RVQ1RfRElSKS9yZXNvdXJjZXMvaW5zcGVjdG9yL0RldlRv b2xzLmpzJywKKyAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9p bnNwZWN0b3IvZGV2VG9vbHMuY3NzJywKKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAg ICAgICdpbWFnZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICc8QCh3ZWJpbnNwZWN0b3JfaW1h Z2VfZmlsZXMpJywKKyAgICAgICAgICAgICAgICAgICAgJzxAKGRldnRvb2xzX2ltYWdlX2ZpbGVz KScsCisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAnaW5wdXRzJzogWworICAg ICAgICAgICAgICAgICAgICAnPEAoX3NjcmlwdF9uYW1lKScsCisgICAgICAgICAgICAgICAgICAg ICc8QChfaW5wdXRfcGFnZXMpJywKKyAgICAgICAgICAgICAgICAgICAgJzxAKF9pbWFnZXMpJywK KyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICdzZWFyY2hfcGF0aCc6IFsKKyAg ICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbWFn ZXMnLAorICAgICAgICAgICAgICAgICAgICAnc3JjL2pzL0ltYWdlcycsCisgICAgICAgICAgICAg ICAgXSwKKyAgICAgICAgICAgICAgICAnb3V0cHV0cyc6IFsnPChTSEFSRURfSU5URVJNRURJQVRF X0RJUikvZGV2dG9vbHMvZGV2dG9vbHNfcmVzb3VyY2VzLmdyZCddLAorICAgICAgICAgICAgICAg ICdhY3Rpb24nOiBbJ3B5dGhvbicsICc8QChfc2NyaXB0X25hbWUpJywgJzxAKF9pbnB1dF9wYWdl cyknLCAnLS1pbWFnZXMnLCAnPEAoX3NlYXJjaF9wYXRoKScsICctLW91dHB1dCcsICc8QChfb3V0 cHV0cyknXSwKKyAgICAgICAgICAgIH1dLAorICAgICAgICB9LAorICAgICAgICB7CiAgICAgICAg ICAgICAndGFyZ2V0X25hbWUnOiAnd2Via2l0X3VuaXRfdGVzdHMnLAogICAgICAgICAgICAgJ3R5 cGUnOiAnZXhlY3V0YWJsZScsCiAgICAgICAgICAgICAnbXN2c19ndWlkJzogJzdDRUZFODAwLTg0 MDMtNDE4QS1BRDZBLTJENTJDNkZDM0VBRCcsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NjcmlwdHMvZ2VuZXJhdGVfZGV2dG9vbHNfZ3JkLnB5IGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zY3JpcHRzL2dlbmVyYXRlX2RldnRvb2xzX2dyZC5weQpuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yZjY3 NDU1YmVmYjE0OGUzMzgwOWRjZTAyNjc5YTNkNTYwMTY4ZTI0Ci0tLSAvZGV2L251bGwKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zY3JpcHRzL2dlbmVyYXRlX2RldnRvb2xzX2dyZC5weQpA QCAtMCwwICsxLDEyMSBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCisjCisjIENvcHlyaWdodCAo QykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAgICAgKiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisj ICAgICAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAg ICAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2Yg aXRzCisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJv ZHVjdHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlv ciB3cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg VEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElN SVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVN UExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UK KyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKworIiIiQ3JlYXRlcyBhIGdyZCBmaWxlIGZvciBwYWNrYWdpbmcgdGhl IGluc3BlY3RvciBmaWxlcy4iIiIKKworZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCB3aXRoX3N0YXRl bWVudAorCitpbXBvcnQgZXJybm8KK2ltcG9ydCBvcworaW1wb3J0IHNodXRpbAoraW1wb3J0IHN5 cworZnJvbSB4bWwuZG9tIGltcG9ydCBtaW5pZG9tCisKK2tEZXZUb29sc1Jlc291cmNlUHJlZml4 ID0gJ0lEUl9ERVZUT09MU18nCitrR3JkVGVtcGxhdGUgPSAnJyc8P3htbCB2ZXJzaW9uPSIxLjAi IGVuY29kaW5nPSJVVEYtOCI/PgorPGdyaXQgbGF0ZXN0X3B1YmxpY19yZWxlYXNlPSIwIiBjdXJy ZW50X3JlbGVhc2U9IjEiPgorICA8b3V0cHV0cz4KKyAgICA8b3V0cHV0IGZpbGVuYW1lPSJncml0 L2RldnRvb2xzX3Jlc291cmNlcy5oIiB0eXBlPSJyY19oZWFkZXIiPgorICAgICAgPGVtaXQgZW1p dF90eXBlPSdwcmVwZW5kJz48L2VtaXQ+CisgICAgPC9vdXRwdXQ+CisgICAgPG91dHB1dCBmaWxl bmFtZT0iZ3JpdC9kZXZ0b29sc19yZXNvdXJjZXNfbWFwLmNjIiB0eXBlPSJyZXNvdXJjZV9maWxl X21hcF9zb3VyY2UiIC8+CisgICAgPG91dHB1dCBmaWxlbmFtZT0iZ3JpdC9kZXZ0b29sc19yZXNv dXJjZXNfbWFwLmgiIHR5cGU9InJlc291cmNlX21hcF9oZWFkZXIiIC8+CisKKyAgICA8b3V0cHV0 IGZpbGVuYW1lPSJkZXZ0b29sc19yZXNvdXJjZXMucGFrIiB0eXBlPSJkYXRhX3BhY2thZ2UiIC8+ CisgIDwvb3V0cHV0cz4KKyAgPHJlbGVhc2Ugc2VxPSIxIj4KKyAgICA8aW5jbHVkZXM+PC9pbmNs dWRlcz4KKyAgPC9yZWxlYXNlPgorPC9ncml0PgorJycnCisKKworY2xhc3MgUGFyc2VkQXJnczoK KyAgICBkZWYgX19pbml0X18oc2VsZiwgc291cmNlX2ZpbGVzLCBpbWFnZV9kaXJzLCBvdXRwdXRf ZmlsZW5hbWUpOgorICAgICAgICBzZWxmLnNvdXJjZV9maWxlcyA9IHNvdXJjZV9maWxlcworICAg ICAgICBzZWxmLmltYWdlX2RpcnMgPSBpbWFnZV9kaXJzCisgICAgICAgIHNlbGYub3V0cHV0X2Zp bGVuYW1lID0gb3V0cHV0X2ZpbGVuYW1lCisKKworZGVmIHBhcnNlX2FyZ3MoYXJndik6CisgICAg aW1hZ2VzX3Bvc2l0aW9uID0gYXJndi5pbmRleCgnLS1pbWFnZXMnKQorICAgIG91dHB1dF9wb3Np dGlvbiA9IGFyZ3YuaW5kZXgoJy0tb3V0cHV0JykKKyAgICBzb3VyY2VfZmlsZXMgPSBhcmd2Wzpp bWFnZXNfcG9zaXRpb25dCisgICAgaW1hZ2VfZGlycyA9IGFyZ3ZbaW1hZ2VzX3Bvc2l0aW9uICsg MTpvdXRwdXRfcG9zaXRpb25dCisgICAgcmV0dXJuIFBhcnNlZEFyZ3Moc291cmNlX2ZpbGVzLCBp bWFnZV9kaXJzLCBhcmd2W291dHB1dF9wb3NpdGlvbiArIDFdKQorCisKK2RlZiBtYWtlX25hbWVf ZnJvbV9maWxlbmFtZShmaWxlbmFtZSk6CisgICAgcmV0dXJuIChmaWxlbmFtZS5yZXBsYWNlKCcv JywgJ18nKQorICAgICAgICAgICAgICAgICAgICAucmVwbGFjZSgnXFwnLCAnXycpCisgICAgICAg ICAgICAgICAgICAgIC5yZXBsYWNlKCcuJywgJ18nKSkudXBwZXIoKQorCisKK2RlZiBhZGRfZmls ZV90b19ncmQoZ3JkX2RvYywgZmlsZW5hbWUpOgorICAgIGluY2x1ZGVzX25vZGUgPSBncmRfZG9j LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdpbmNsdWRlcycpWzBdCisgICAgaW5jbHVkZXNfbm9kZS5h cHBlbmRDaGlsZChncmRfZG9jLmNyZWF0ZVRleHROb2RlKCdcbiAgICAgICcpKQorCisgICAgbmV3 X2luY2x1ZGVfbm9kZSA9IGdyZF9kb2MuY3JlYXRlRWxlbWVudCgnaW5jbHVkZScpCisgICAgbmV3 X2luY2x1ZGVfbm9kZS5zZXRBdHRyaWJ1dGUoJ25hbWUnLCBtYWtlX25hbWVfZnJvbV9maWxlbmFt ZShmaWxlbmFtZSkpCisgICAgbmV3X2luY2x1ZGVfbm9kZS5zZXRBdHRyaWJ1dGUoJ2ZpbGUnLCBm aWxlbmFtZSkKKyAgICBuZXdfaW5jbHVkZV9ub2RlLnNldEF0dHJpYnV0ZSgndHlwZScsICdCSU5E QVRBJykKKyAgICBpbmNsdWRlc19ub2RlLmFwcGVuZENoaWxkKG5ld19pbmNsdWRlX25vZGUpCisK KworZGVmIG1haW4oYXJndik6CisgICAgcGFyc2VkX2FyZ3MgPSBwYXJzZV9hcmdzKGFyZ3ZbMTpd KQorCisgICAgZG9jID0gbWluaWRvbS5wYXJzZVN0cmluZyhrR3JkVGVtcGxhdGUpCisgICAgb3V0 cHV0X2RpcmVjdG9yeSA9IG9zLnBhdGguZGlybmFtZShwYXJzZWRfYXJncy5vdXRwdXRfZmlsZW5h bWUpCisKKyAgICB0cnk6CisgICAgICAgIG9zLm1ha2VkaXJzKG9zLnBhdGguam9pbihvdXRwdXRf ZGlyZWN0b3J5LCAnSW1hZ2VzJykpCisgICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAgIGlm IGUuZXJybm8gIT0gZXJybm8uRUVYSVNUOgorICAgICAgICAgICAgcmFpc2UgZQorCisgICAgZm9y IGZpbGVuYW1lIGluIHBhcnNlZF9hcmdzLnNvdXJjZV9maWxlczoKKyAgICAgICAgc2h1dGlsLmNv cHkoZmlsZW5hbWUsIG91dHB1dF9kaXJlY3RvcnkpCisgICAgICAgIGFkZF9maWxlX3RvX2dyZChk b2MsIG9zLnBhdGguYmFzZW5hbWUoZmlsZW5hbWUpKQorCisgICAgZm9yIGRpcm5hbWUgaW4gcGFy c2VkX2FyZ3MuaW1hZ2VfZGlyczoKKyAgICAgICAgZm9yIGZpbGVuYW1lIGluIG9zLmxpc3RkaXIo ZGlybmFtZSk6CisgICAgICAgICAgICBpZiBub3QgZmlsZW5hbWUuZW5kc3dpdGgoJy5wbmcnKToK KyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgc2h1dGlsLmNvcHkob3MucGF0 aC5qb2luKGRpcm5hbWUsIGZpbGVuYW1lKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIG9zLnBh dGguam9pbihvdXRwdXRfZGlyZWN0b3J5LCAnSW1hZ2VzJykpCisgICAgICAgICAgICBhZGRfZmls ZV90b19ncmQoZG9jLCBvcy5wYXRoLmpvaW4oJ0ltYWdlcycsIGZpbGVuYW1lKSkKKworICAgIHdp dGggb3BlbihwYXJzZWRfYXJncy5vdXRwdXRfZmlsZW5hbWUsICd3JykgYXMgb3V0cHV0X2ZpbGU6 CisgICAgICAgIG91dHB1dF9maWxlLndyaXRlKGRvYy50b3htbChlbmNvZGluZz0nVVRGLTgnKSkK KworCitpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgorICAgIHN5cy5leGl0KG1haW4oc3lzLmFy Z3YpKQo=