41669 2010-07-06 02:16:59 -0700 [Chromium] Upstreaming inspector_resources target 2010-07-14 00:04:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 42144 1 tkent webkit-unassigned dglazkov pfeldman rolandsteiner tony oldest_to_newest 246957 0 tkent 2010-07-06 02:16:59 -0700 Upstreaming 'inspector_resources', which is currently in src/webkit/webkit.gyp of Chromium tree, to WebKit.gyp. 246961 1 60605 tkent 2010-07-06 02:22:57 -0700 Created attachment 60605 Patch 247447 2 60605 abarth 2010-07-07 03:23:52 -0700 Comment on attachment 60605 Patch This gyp magic is too deep for me, sorry. 247569 3 60605 tony 2010-07-07 08:30:08 -0700 Comment on attachment 60605 Patch I realize that this is mostly a copy/paste from the existing gyp file, but might as well clean up the code a bit. WebKit/chromium/WebKit.gyp:68 + 'debug_devtools%': 0, Nit: It would be nice if there was a comment describing what this does. WebKit/chromium/WebKit.gyp:562 + # 'msvs_guid': '5330F8EE-00F5-D65C-166E-E3150171055D', Can we just remove this? WebKit/chromium/WebKit.gyp:566 + 'dependencies+': ['concatenated_devtools_js'], What does the + at the end do? WebKit/chromium/WebKit.gyp:578 + 'files/': [['exclude', '\\.js$']], What does the / at the end of files do? WebKit/chromium/WebKit.gyp:599 + '<(chromium_src_dir)/webkit/build/generate_devtools_html.py', Can we upstream generate_devtools_html.py too? 247944 4 60824 tkent 2010-07-07 19:17:39 -0700 Created attachment 60824 Patch 2 247949 5 tkent 2010-07-07 19:23:57 -0700 Thank you for looking at the patch. (In reply to comment #3) > WebKit/chromium/WebKit.gyp:68 > + 'debug_devtools%': 0, > Nit: It would be nice if there was a comment describing what this does. Added a comment. > WebKit/chromium/WebKit.gyp:562 > + # 'msvs_guid': '5330F8EE-00F5-D65C-166E-E3150171055D', > Can we just remove this? Removed. According to http://code.google.com/p/gyp/wiki/GypUserDocumentation#Skeleton_of_a_typical_executable_target_in_a_.gyp_file, we don't need msvs_guid anymore, right? > WebKit/chromium/WebKit.gyp:566 > + 'dependencies+': ['concatenated_devtools_js'], > What does the + at the end do? Prepending something to 'dependencies' makes no sense. I removed '+'. > WebKit/chromium/WebKit.gyp:578 > + 'files/': [['exclude', '\\.js$']], > What does the / at the end of files do? I think we need to use pattern exclusion here. http://code.google.com/p/gyp/wiki/InputFormatReference#Pattern_Lists_(/) > WebKit/chromium/WebKit.gyp:599 > + '<(chromium_src_dir)/webkit/build/generate_devtools_html.py', > Can we upstream generate_devtools_html.py too? We can. Where should we put it to? WebKitTools/Scripts? 248321 6 tony 2010-07-08 10:39:38 -0700 LGTM '<(chromium_src_dir)/webkit/build/generate_devtools_html.py', > > Can we upstream generate_devtools_html.py too? > > We can. Where should we put it to? WebKitTools/Scripts? Hmm, good question. I guess I would be nice to make a directory at WebKit/WebKit/chromium/WebKit.gyp/ to put all the build related files (kind of like how we have WebCore/WebCore.gyp/). It's kind of a pain to move WebKit.gyp now, so maybe just put it in WebKit/WebKit/chromium/ for now. WebKitTools/Scripts doesn't seem to contain any build related scripts. 250316 7 60824 tkent 2010-07-12 22:37:45 -0700 Comment on attachment 60824 Patch 2 Clearing flags on attachment: 60824 Committed r63171: <http://trac.webkit.org/changeset/63171> 250317 8 tkent 2010-07-12 22:37:53 -0700 All reviewed patches have been landed. Closing bug. 250333 9 tkent 2010-07-12 23:06:43 -0700 I rolled r63171 out. It failed by the following errors on Chromium Linux canary: make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/codemap.js', needed by `out/Release/resources/inspector/DevTools.js'. make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/consarray.js', needed by `out/Release/resources/inspector/DevTools.js'. make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/csvparser.js', needed by `out/Release/resources/inspector/DevTools.js'. make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/logreader.js', needed by `out/Release/resources/inspector/DevTools.js'. make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/profile.js', needed by `out/Release/resources/inspector/DevTools.js'. make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/profile_view.js', needed by `out/Release/resources/inspector/DevTools.js'. make: *** No rule to make target `third_party/WebKit/WebKit/chromium/v8/tools/splaytree.js', needed by `out/Release/resources/inspector/DevTools.js'. I'm investigating... 250337 10 pfeldman 2010-07-12 23:09:37 -0700 Please don't land this unless tested on all platforms. I'd like to have us rolled today. 250346 11 tkent 2010-07-12 23:21:43 -0700 I identified the problem. (In reply to comment #10) > Please don't land this unless tested on all platforms. I'd like to have us rolled today. ok, I'll test and will re-land the change tomorrow just in case. 251002 12 tkent 2010-07-14 00:04:57 -0700 Re-landed as r63285: http://trac.webkit.org/changeset/63285 60605 2010-07-06 02:22:57 -0700 2010-07-07 19:17:33 -0700 Patch bug-41669-20100706182256.patch text/plain 5959 tkent ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDI5Y2Y4ZjRhOTY3YzJjMzFlZmM0NmI2YjczYTFiMGEzNzQ0MTgzMWMu LmYxZmU3MmMxNjlhOWU0NTRmN2M1Y2JkMjEzMWQwODhjZDFmM2UwMTggMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDEwLTA3LTA2ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Q2hyb21pdW1dIFVwc3RyZWFtaW5nIGluc3BlY3Rvcl9yZXNvdXJjZXMgdGFyZ2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTY2OQorCisgICAgICAg ICdpbnNwZWN0b3JfcmVzb3VyY2UnIGlzIGN1cnJlbnRseSBpbiBzcmMvd2Via2l0L3dlYmtpdC5n eXAgb2YKKyAgICAgICAgQ2hyb21pdW0gdHJlZS4gV2UgbW92ZSBpdCB0byBXZWJLaXQgdHJlZSBi ZWNhdXNlOgorICAgICAgICAtIER1bXBSZW5kZXJUcmVlIGluIFdlYktpdCB0cmVlIG5lZWRzIGl0 LCBhbmQKKyAgICAgICAgLSBJdCdzIGhhcmQgdG8gcmVmZXIgdG8gV2ViS2l0Lmd5cGkgYW5kIFdl YkNvcmUuZ3lwaSBmcm9tCisgICAgICAgICAgd2Via2l0X3N1cHBvcnQgaW4gYm90aCBjYXNlcyBv ZiBDaHJvbWl1bS10cmVlIGJ1aWxkIGFuZAorICAgICAgICAgIFdlYktpdC10cmVlIGJ1aWxkLgor CisgICAgICAgICdtc3ZzX2d1aWQnIHByb3BlcnRpZXMgYXJlIGNvbW1lbnRlZCBvdXQgZm9yIG5v dy4KKworICAgICAgICAqIFdlYktpdC5neXA6CisKIDIwMTAtMDctMDUgIFl1cnkgU2VtaWtoYXRz a3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvV2ViS2l0L2No cm9taXVtL1dlYktpdC5neXAKaW5kZXggZTJkYTFiNDg0ZDk5NTdiZGJkODAwMTJkOWYwMWI0Mjk4 N2IyOTIyZC4uNTMxMGRkZGY2MTA4MGZkOGQ5ZTA4YzAyNjBjNTJlNGUxZGViNTczOCAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIvV2ViS2l0L2Nocm9taXVtL1dl YktpdC5neXAKQEAgLTMwLDggKzMwLDEwIEBACiAKIHsKICAgICAnaW5jbHVkZXMnOiBbCi0gICAg ICAgICdmZWF0dXJlcy5neXBpJywKKyAgICAgICAgJy4uLy4uL1dlYkNvcmUvV2ViQ29yZS5neXBp JywKICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJU cmVlLmd5cGknLAorICAgICAgICAnV2ViS2l0Lmd5cGknLAorICAgICAgICAnZmVhdHVyZXMuZ3lw aScsCiAgICAgXSwKICAgICAndmFyaWFibGVzJzogewogICAgICAgICAnd2Via2l0X3RhcmdldF90 eXBlJzogJ3N0YXRpY19saWJyYXJ5JywKQEAgLTQ4LDYgKzUwLDIyIEBACiAgICAgICAgICAgICB9 XSwKICAgICAgICAgXSwKICAgICAgICAgJ2FoZW1fcGF0aCc6ICcuLi8uLi9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9mb250cy9BSEVNX19fXy5UVEYnLAorCisgICAgICAgICMgTGlzdCBv ZiBEZXZUb29scyBzb3VyY2UgZmlsZXMsIG9yZGVyZWQgYnkgZGVwZW5kZW5jaWVzLiBJdCBpcyB1 c2VkIGJvdGgKKyAgICAgICAgIyBmb3IgY29weWluZyB0aGVtIHRvIHJlc291cmNlIGRpciwgYW5k IGZvciBnZW5lcmF0aW5nICdkZXZ0b29scy5odG1sJyBmaWxlLgorICAgICAgICAnZGV2dG9vbHNf ZmlsZXMnOiBbCisgICAgICAgICAgICAnPEAoZGV2dG9vbHNfY3NzX2ZpbGVzKScsCisgICAgICAg ICAgICAndjgvdG9vbHMvY29kZW1hcC5qcycsCisgICAgICAgICAgICAndjgvdG9vbHMvY29uc2Fy cmF5LmpzJywKKyAgICAgICAgICAgICd2OC90b29scy9jc3ZwYXJzZXIuanMnLAorICAgICAgICAg ICAgJ3Y4L3Rvb2xzL2xvZ3JlYWRlci5qcycsCisgICAgICAgICAgICAndjgvdG9vbHMvcHJvZmls ZS5qcycsCisgICAgICAgICAgICAndjgvdG9vbHMvcHJvZmlsZV92aWV3LmpzJywKKyAgICAgICAg ICAgICd2OC90b29scy9zcGxheXRyZWUuanMnLAorICAgICAgICAgICAgJzxAKGRldnRvb2xzX2pz X2ZpbGVzKScsCisgICAgICAgIF0sCisKKyAgICAgICAgJ2RlYnVnX2RldnRvb2xzJSc6IDAsCiAg ICAgfSwKICAgICAndGFyZ2V0cyc6IFsKICAgICAgICAgewpAQCAtNTM3LDYgKzU1NSw4MiBAQAog ICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgXSwKICAgICAgICAgfSwKKworICAgICAg ICB7CisgICAgICAgICAgICAndGFyZ2V0X25hbWUnOiAnaW5zcGVjdG9yX3Jlc291cmNlcycsCisg ICAgICAgICAgICAndHlwZSc6ICdub25lJywKKyAgICAgICAgICAgICMgJ21zdnNfZ3VpZCc6ICc1 MzMwRjhFRS0wMEY1LUQ2NUMtMTY2RS1FMzE1MDE3MTA1NUQnLAorICAgICAgICAgICAgJ2RlcGVu ZGVuY2llcyc6IFsnZGV2dG9vbHNfaHRtbCddLAorICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBb CisgICAgICAgICAgICAgICAgWydkZWJ1Z19kZXZ0b29scz09MCcsIHsKKyAgICAgICAgICAgICAg ICAgICAgJ2RlcGVuZGVuY2llcysnOiBbJ2NvbmNhdGVuYXRlZF9kZXZ0b29sc19qcyddLAorICAg ICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICdjb3BpZXMnOiBb CisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAnZGVzdGluYXRpb24nOiAn PChQUk9EVUNUX0RJUikvcmVzb3VyY2VzL2luc3BlY3RvcicsCisgICAgICAgICAgICAgICAgICAg ICdmaWxlcyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICc8QChkZXZ0b29sc19maWxlcykn LAorICAgICAgICAgICAgICAgICAgICAgICAgJzxAKHdlYmluc3BlY3Rvcl9maWxlcyknLAorICAg ICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsK KyAgICAgICAgICAgICAgICAgICAgICAgIFsnZGVidWdfZGV2dG9vbHM9PTAnLCB7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ2ZpbGVzLyc6IFtbJ2V4Y2x1ZGUnLCAnXFwuanMkJ11dLAor ICAgICAgICAgICAgICAgICAgICAgICAgfV0sCisgICAgICAgICAgICAgICAgICAgIF0sCisgICAg ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICdk ZXN0aW5hdGlvbic6ICc8KFBST0RVQ1RfRElSKS9yZXNvdXJjZXMvaW5zcGVjdG9yL0ltYWdlcycs CisgICAgICAgICAgICAgICAgICAgICdmaWxlcyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAg ICc8QCh3ZWJpbnNwZWN0b3JfaW1hZ2VfZmlsZXMpJywKKyAgICAgICAgICAgICAgICAgICAgICAg ICc8QChkZXZ0b29sc19pbWFnZV9maWxlcyknLAorICAgICAgICAgICAgICAgICAgICBdLAorICAg ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIF0sCisgICAgICAgIH0sCisgICAgICAgIHsKKyAg ICAgICAgICAgICd0YXJnZXRfbmFtZSc6ICdkZXZ0b29sc19odG1sJywKKyAgICAgICAgICAgICd0 eXBlJzogJ25vbmUnLAorICAgICAgICAgICAgIydtc3ZzX2d1aWQnOiAnOUJFNUQ0RDUtRTgwMC00 NEY5LUI2QzAtMjdERjE1QTlEODE3JywKKyAgICAgICAgICAgICdzb3VyY2VzJzogWyc8KFBST0RV Q1RfRElSKS9yZXNvdXJjZXMvaW5zcGVjdG9yL2RldnRvb2xzLmh0bWwnXSwKKyAgICAgICAgICAg ICdhY3Rpb25zJzogW3sKKyAgICAgICAgICAgICAgICAnYWN0aW9uX25hbWUnOiAnZGV2dG9vbHNf aHRtbCcsCisgICAgICAgICAgICAgICAgJ2lucHV0cyc6IFsKKyAgICAgICAgICAgICAgICAgICAg JzwoY2hyb21pdW1fc3JjX2Rpcikvd2Via2l0L2J1aWxkL2dlbmVyYXRlX2RldnRvb2xzX2h0bWwu cHknLAorICAgICAgICAgICAgICAgICAgICAjIFNlZSBpc3N1ZSAyOTY5NTogV2ViS2l0Lmd5cGkg aXMgYSBzb3VyY2UgZmlsZSBmb3IgZGV2dG9vbHMuaHRtbC4KKyAgICAgICAgICAgICAgICAgICAg J1dlYktpdC5neXBpJywKKyAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCcsCisgICAgICAgICAgICAgICAgXSwKKyAgICAg ICAgICAgICAgICAnb3V0cHV0cyc6IFsnPChQUk9EVUNUX0RJUikvcmVzb3VyY2VzL2luc3BlY3Rv ci9kZXZ0b29scy5odG1sJ10sCisgICAgICAgICAgICAgICAgJ2FjdGlvbic6IFsncHl0aG9uJywg JzxAKF9pbnB1dHMpJywgJzxAKF9vdXRwdXRzKScsICc8QChkZXZ0b29sc19maWxlcyknXSwKKyAg ICAgICAgICAgIH1dLAorICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICAndGFyZ2V0 X25hbWUnOiAnY29uY2F0ZW5hdGVkX2RldnRvb2xzX2pzJywKKyAgICAgICAgICAgICd0eXBlJzog J25vbmUnLAorICAgICAgICAgICAgIydtc3ZzX2d1aWQnOiAnOENDRkRGNEEtQjcwMi00OTg4LTky MDctNjIzRDE0NzdEM0U3JywKKyAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbJ2RldnRvb2xz X2h0bWwnXSwKKyAgICAgICAgICAgICdzb3VyY2VzJzogWyc8KFBST0RVQ1RfRElSKS9yZXNvdXJj ZXMvaW5zcGVjdG9yL0RldlRvb2xzLmpzJ10sCisgICAgICAgICAgICAnYWN0aW9ucyc6IFt7Cisg ICAgICAgICAgICAgICAgJ2FjdGlvbl9uYW1lJzogJ2NvbmNhdGVuYXRlX2RldnRvb2xzX2pzJywK KyAgICAgICAgICAgICAgICAnc2NyaXB0X25hbWUnOiAnPChjaHJvbWl1bV9zcmNfZGlyKS93ZWJr aXQvYnVpbGQvY29uY2F0ZW5hdGVfanNfZmlsZXMucHknLAorICAgICAgICAgICAgICAgICdpbnB1 dF9wYWdlJzogJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9pbnNwZWN0b3IvZGV2dG9vbHMuaHRt bCcsCisgICAgICAgICAgICAgICAgJ2lucHV0cyc6IFsKKyAgICAgICAgICAgICAgICAgICAgJzxA KF9zY3JpcHRfbmFtZSknLAorICAgICAgICAgICAgICAgICAgICAnPEAoX2lucHV0X3BhZ2UpJywK KyAgICAgICAgICAgICAgICAgICAgJzxAKHdlYmluc3BlY3Rvcl9maWxlcyknLAorICAgICAgICAg ICAgICAgICAgICAnPEAoZGV2dG9vbHNfZmlsZXMpJywKKyAgICAgICAgICAgICAgICBdLAorICAg ICAgICAgICAgICAgICdzZWFyY2hfcGF0aCc6IFsKKyAgICAgICAgICAgICAgICAgICAgJy4uLy4u L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZCcsCisgICAgICAgICAgICAgICAgICAgICdzcmMv anMnLAorICAgICAgICAgICAgICAgICAgICAndjgvdG9vbHMnLAorICAgICAgICAgICAgICAgIF0s CisgICAgICAgICAgICAgICAgJ291dHB1dHMnOiBbJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9p bnNwZWN0b3IvRGV2VG9vbHMuanMnXSwKKyAgICAgICAgICAgICAgICAnYWN0aW9uJzogWydweXRo b24nLCAnPEAoX3NjcmlwdF9uYW1lKScsICc8QChfaW5wdXRfcGFnZSknLCAnPEAoX3NlYXJjaF9w YXRoKScsICc8QChfb3V0cHV0cyknXSwKKyAgICAgICAgICAgIH1dLAorICAgICAgICB9LAorCiAg ICAgICAgIHsKICAgICAgICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJraXRfdW5pdF90ZXN0cycs CiAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKQEAgLTYwNCw2ICs2OTgsNyBAQAogICAgICAg ICAgICAgJ3R5cGUnOiAnZXhlY3V0YWJsZScsCiAgICAgICAgICAgICAnbWFjX2J1bmRsZSc6IDEs CiAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWworICAgICAgICAgICAgICAgICdpbnNwZWN0 b3JfcmVzb3VyY2VzJywKICAgICAgICAgICAgICAgICAnd2Via2l0JywKICAgICAgICAgICAgICAg ICAnLi4vLi4vSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3Jl Lmd5cDp3dGZfY29uZmlnJywKICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90 aGlyZF9wYXJ0eS9pY3UvaWN1Lmd5cDppY3V1YycsCg== 60824 2010-07-07 19:17:39 -0700 2010-07-12 22:37:45 -0700 Patch 2 bug-41669-20100708111736.patch text/plain 5821 tkent ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDM1OWRjMTU0YzA4ODhjOTQyNTMwNGM5YWE2MTdiODM1ZmMxZmVlNjcu LjRjZTg4YTYzMGQ3OGIxYTg0MjJlNDIxMmJlYWQ0MTZmNmE2MDU2ZjEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE5IEBACisyMDEwLTA3LTA2ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Q2hyb21pdW1dIFVwc3RyZWFtaW5nIGluc3BlY3Rvcl9yZXNvdXJjZXMgdGFyZ2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTY2OQorCisgICAgICAg ICdpbnNwZWN0b3JfcmVzb3VyY2UnIGlzIGN1cnJlbnRseSBpbiBzcmMvd2Via2l0L3dlYmtpdC5n eXAgb2YKKyAgICAgICAgQ2hyb21pdW0gdHJlZS4gV2UgbW92ZSBpdCB0byBXZWJLaXQgdHJlZSBi ZWNhdXNlOgorICAgICAgICAtIER1bXBSZW5kZXJUcmVlIGluIFdlYktpdCB0cmVlIG5lZWRzIGl0 LCBhbmQKKyAgICAgICAgLSBJdCdzIGhhcmQgdG8gcmVmZXIgdG8gV2ViS2l0Lmd5cGkgYW5kIFdl YkNvcmUuZ3lwaSBmcm9tCisgICAgICAgICAgd2Via2l0X3N1cHBvcnQgaW4gYm90aCBjYXNlcyBv ZiBDaHJvbWl1bS10cmVlIGJ1aWxkIGFuZAorICAgICAgICAgIFdlYktpdC10cmVlIGJ1aWxkLgor CisgICAgICAgICogV2ViS2l0Lmd5cDoKKwogMjAxMC0wNy0wNiAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5IHRvIGZpeCBidWlsZC4KZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5k ZXggZTJkYTFiNDg0ZDk5NTdiZGJkODAwMTJkOWYwMWI0Mjk4N2IyOTIyZC4uN2QzNWRjMDI3ODIy MDAwNDllYTZlMTg0NTU4NzhkMDUyZWI1MDViMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXAKKysrIGIvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTMwLDggKzMw LDEwIEBACiAKIHsKICAgICAnaW5jbHVkZXMnOiBbCi0gICAgICAgICdmZWF0dXJlcy5neXBpJywK KyAgICAgICAgJy4uLy4uL1dlYkNvcmUvV2ViQ29yZS5neXBpJywKICAgICAgICAgJy4uLy4uL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cGknLAorICAgICAgICAn V2ViS2l0Lmd5cGknLAorICAgICAgICAnZmVhdHVyZXMuZ3lwaScsCiAgICAgXSwKICAgICAndmFy aWFibGVzJzogewogICAgICAgICAnd2Via2l0X3RhcmdldF90eXBlJzogJ3N0YXRpY19saWJyYXJ5 JywKQEAgLTQ4LDYgKzUwLDI0IEBACiAgICAgICAgICAgICB9XSwKICAgICAgICAgXSwKICAgICAg ICAgJ2FoZW1fcGF0aCc6ICcuLi8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9mb250 cy9BSEVNX19fXy5UVEYnLAorCisgICAgICAgICMgTGlzdCBvZiBEZXZUb29scyBzb3VyY2UgZmls ZXMsIG9yZGVyZWQgYnkgZGVwZW5kZW5jaWVzLiBJdCBpcyB1c2VkIGJvdGgKKyAgICAgICAgIyBm b3IgY29weWluZyB0aGVtIHRvIHJlc291cmNlIGRpciwgYW5kIGZvciBnZW5lcmF0aW5nICdkZXZ0 b29scy5odG1sJyBmaWxlLgorICAgICAgICAnZGV2dG9vbHNfZmlsZXMnOiBbCisgICAgICAgICAg ICAnPEAoZGV2dG9vbHNfY3NzX2ZpbGVzKScsCisgICAgICAgICAgICAndjgvdG9vbHMvY29kZW1h cC5qcycsCisgICAgICAgICAgICAndjgvdG9vbHMvY29uc2FycmF5LmpzJywKKyAgICAgICAgICAg ICd2OC90b29scy9jc3ZwYXJzZXIuanMnLAorICAgICAgICAgICAgJ3Y4L3Rvb2xzL2xvZ3JlYWRl ci5qcycsCisgICAgICAgICAgICAndjgvdG9vbHMvcHJvZmlsZS5qcycsCisgICAgICAgICAgICAn djgvdG9vbHMvcHJvZmlsZV92aWV3LmpzJywKKyAgICAgICAgICAgICd2OC90b29scy9zcGxheXRy ZWUuanMnLAorICAgICAgICAgICAgJzxAKGRldnRvb2xzX2pzX2ZpbGVzKScsCisgICAgICAgIF0s CisKKyAgICAgICAgIyBJZiBkZWJ1Z19kZXZ0b29scyBpcyBzZXQgdG8gMSwgSmF2YVNjcmlwdCBm aWxlcyBmb3IgRGV2VG9vbHMgYXJlCisgICAgICAgICMgc3RvcmVkIGFzIGlzLiBPdGhlcndpc2Us IGEgY29uY2F0ZW5hdGVkIGZpbGUgaXMgc3RvcmVkLgorICAgICAgICAnZGVidWdfZGV2dG9vbHMl JzogMCwKICAgICB9LAogICAgICd0YXJnZXRzJzogWwogICAgICAgICB7CkBAIC01MzcsNiArNTU3 LDc5IEBACiAgICAgICAgICAgICAgICAgfV0sCiAgICAgICAgICAgICBdLAogICAgICAgICB9LAor CisgICAgICAgIHsKKyAgICAgICAgICAgICd0YXJnZXRfbmFtZSc6ICdpbnNwZWN0b3JfcmVzb3Vy Y2VzJywKKyAgICAgICAgICAgICd0eXBlJzogJ25vbmUnLAorICAgICAgICAgICAgJ2RlcGVuZGVu Y2llcyc6IFsnZGV2dG9vbHNfaHRtbCddLAorICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCisg ICAgICAgICAgICAgICAgWydkZWJ1Z19kZXZ0b29scz09MCcsIHsKKyAgICAgICAgICAgICAgICAg ICAgJ2RlcGVuZGVuY2llcyc6IFsnY29uY2F0ZW5hdGVkX2RldnRvb2xzX2pzJ10sCisgICAgICAg ICAgICAgICAgfV0sCisgICAgICAgICAgICBdLAorICAgICAgICAgICAgJ2NvcGllcyc6IFsKKyAg ICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICdkZXN0aW5hdGlvbic6ICc8KFBS T0RVQ1RfRElSKS9yZXNvdXJjZXMvaW5zcGVjdG9yJywKKyAgICAgICAgICAgICAgICAgICAgJ2Zp bGVzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgJzxAKGRldnRvb2xzX2ZpbGVzKScsCisg ICAgICAgICAgICAgICAgICAgICAgICAnPEAod2ViaW5zcGVjdG9yX2ZpbGVzKScsCisgICAgICAg ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAgICdjb25kaXRpb25zJzogWworICAg ICAgICAgICAgICAgICAgICAgICAgWydkZWJ1Z19kZXZ0b29scz09MCcsIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnZmlsZXMvJzogW1snZXhjbHVkZScsICdcXC5qcyQnXV0sCisgICAg ICAgICAgICAgICAgICAgICAgICB9XSwKKyAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAg ICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgJ2Rlc3Rp bmF0aW9uJzogJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9pbnNwZWN0b3IvSW1hZ2VzJywKKyAg ICAgICAgICAgICAgICAgICAgJ2ZpbGVzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgJzxA KHdlYmluc3BlY3Rvcl9pbWFnZV9maWxlcyknLAorICAgICAgICAgICAgICAgICAgICAgICAgJzxA KGRldnRvb2xzX2ltYWdlX2ZpbGVzKScsCisgICAgICAgICAgICAgICAgICAgIF0sCisgICAgICAg ICAgICAgICB9LAorICAgICAgICAgICAgXSwKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAg ICAgICAgJ3RhcmdldF9uYW1lJzogJ2RldnRvb2xzX2h0bWwnLAorICAgICAgICAgICAgJ3R5cGUn OiAnbm9uZScsCisgICAgICAgICAgICAnc291cmNlcyc6IFsnPChQUk9EVUNUX0RJUikvcmVzb3Vy Y2VzL2luc3BlY3Rvci9kZXZ0b29scy5odG1sJ10sCisgICAgICAgICAgICAnYWN0aW9ucyc6IFt7 CisgICAgICAgICAgICAgICAgJ2FjdGlvbl9uYW1lJzogJ2RldnRvb2xzX2h0bWwnLAorICAgICAg ICAgICAgICAgICdpbnB1dHMnOiBbCisgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3Ny Y19kaXIpL3dlYmtpdC9idWlsZC9nZW5lcmF0ZV9kZXZ0b29sc19odG1sLnB5JywKKyAgICAgICAg ICAgICAgICAgICAgIyBTZWUgaXNzdWUgMjk2OTU6IFdlYktpdC5neXBpIGlzIGEgc291cmNlIGZp bGUgZm9yIGRldnRvb2xzLmh0bWwuCisgICAgICAgICAgICAgICAgICAgICdXZWJLaXQuZ3lwaScs CisgICAgICAgICAgICAgICAgICAgICcuLi8uLi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmh0bWwnLAorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgJ291 dHB1dHMnOiBbJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9pbnNwZWN0b3IvZGV2dG9vbHMuaHRt bCddLAorICAgICAgICAgICAgICAgICdhY3Rpb24nOiBbJ3B5dGhvbicsICc8QChfaW5wdXRzKScs ICc8QChfb3V0cHV0cyknLCAnPEAoZGV2dG9vbHNfZmlsZXMpJ10sCisgICAgICAgICAgICB9XSwK KyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ2NvbmNh dGVuYXRlZF9kZXZ0b29sc19qcycsCisgICAgICAgICAgICAndHlwZSc6ICdub25lJywKKyAgICAg ICAgICAgICdkZXBlbmRlbmNpZXMnOiBbJ2RldnRvb2xzX2h0bWwnXSwKKyAgICAgICAgICAgICdz b3VyY2VzJzogWyc8KFBST0RVQ1RfRElSKS9yZXNvdXJjZXMvaW5zcGVjdG9yL0RldlRvb2xzLmpz J10sCisgICAgICAgICAgICAnYWN0aW9ucyc6IFt7CisgICAgICAgICAgICAgICAgJ2FjdGlvbl9u YW1lJzogJ2NvbmNhdGVuYXRlX2RldnRvb2xzX2pzJywKKyAgICAgICAgICAgICAgICAnc2NyaXB0 X25hbWUnOiAnPChjaHJvbWl1bV9zcmNfZGlyKS93ZWJraXQvYnVpbGQvY29uY2F0ZW5hdGVfanNf ZmlsZXMucHknLAorICAgICAgICAgICAgICAgICdpbnB1dF9wYWdlJzogJzwoUFJPRFVDVF9ESVIp L3Jlc291cmNlcy9pbnNwZWN0b3IvZGV2dG9vbHMuaHRtbCcsCisgICAgICAgICAgICAgICAgJ2lu cHV0cyc6IFsKKyAgICAgICAgICAgICAgICAgICAgJzxAKF9zY3JpcHRfbmFtZSknLAorICAgICAg ICAgICAgICAgICAgICAnPEAoX2lucHV0X3BhZ2UpJywKKyAgICAgICAgICAgICAgICAgICAgJzxA KHdlYmluc3BlY3Rvcl9maWxlcyknLAorICAgICAgICAgICAgICAgICAgICAnPEAoZGV2dG9vbHNf ZmlsZXMpJywKKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICdzZWFyY2hfcGF0 aCc6IFsKKyAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZCcsCisgICAgICAgICAgICAgICAgICAgICdzcmMvanMnLAorICAgICAgICAgICAgICAgICAg ICAndjgvdG9vbHMnLAorICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgJ291dHB1 dHMnOiBbJzwoUFJPRFVDVF9ESVIpL3Jlc291cmNlcy9pbnNwZWN0b3IvRGV2VG9vbHMuanMnXSwK KyAgICAgICAgICAgICAgICAnYWN0aW9uJzogWydweXRob24nLCAnPEAoX3NjcmlwdF9uYW1lKScs ICc8QChfaW5wdXRfcGFnZSknLCAnPEAoX3NlYXJjaF9wYXRoKScsICc8QChfb3V0cHV0cyknXSwK KyAgICAgICAgICAgIH1dLAorICAgICAgICB9LAorCiAgICAgICAgIHsKICAgICAgICAgICAgICd0 YXJnZXRfbmFtZSc6ICd3ZWJraXRfdW5pdF90ZXN0cycsCiAgICAgICAgICAgICAnY29uZGl0aW9u cyc6IFsKQEAgLTYwNCw2ICs2OTcsNyBAQAogICAgICAgICAgICAgJ3R5cGUnOiAnZXhlY3V0YWJs ZScsCiAgICAgICAgICAgICAnbWFjX2J1bmRsZSc6IDEsCiAgICAgICAgICAgICAnZGVwZW5kZW5j aWVzJzogWworICAgICAgICAgICAgICAgICdpbnNwZWN0b3JfcmVzb3VyY2VzJywKICAgICAgICAg ICAgICAgICAnd2Via2l0JywKICAgICAgICAgICAgICAgICAnLi4vLi4vSmF2YVNjcmlwdENvcmUv SmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cDp3dGZfY29uZmlnJywKICAgICAg ICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0eS9pY3UvaWN1Lmd5cDpp Y3V1YycsCg==