228716 2021-08-02 14:36:45 -0700 Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js` 2021-08-02 19:26:49 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes mjs pvollan webkit-bug-importer oldest_to_newest 1781393 0 pangle 2021-08-02 14:36:45 -0700 <rdar://81329155> 1781395 1 434789 pangle 2021-08-02 14:40:06 -0700 Created attachment 434789 Patch v1.0 1781442 2 434789 pvollan 2021-08-02 16:05:08 -0700 Comment on attachment 434789 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=434789&action=review > Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl:78 > +my $jsFrom = File::Spec->catfile(File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'inspector'), 'InspectorBackendCommands.js'); Has this file changed location in the JavaScriptCore build? 1781446 3 434789 pangle 2021-08-02 16:12:02 -0700 Comment on attachment 434789 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=434789&action=review >> Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl:78 >> +my $jsFrom = File::Spec->catfile(File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'inspector'), 'InspectorBackendCommands.js'); > > Has this file changed location in the JavaScriptCore build? Not any time recently, no. It has been in the `.../inspector/` folder for some time, and this script didn't take that into account. Technically, it didn't affect the build before because in `WebInspectorUI.make` the path was just completely hard coded again anyways, which left the print statement below both wrong and unhelpful. The fix on this line brings the logging in line with the actual command we run later in `WebInspectorUI.make` with the `JAVASCRIPTCORE_PRIVATE_HEADERS_DIR` environment variable. 1781477 4 434789 mjs 2021-08-02 17:14:00 -0700 Comment on attachment 434789 Patch v1.0 I'm not totally clear on why this broke or why this change fixes it, but it seems reasonable to try. 1781481 5 434789 mjs 2021-08-02 17:20:14 -0700 Comment on attachment 434789 Patch v1.0 Marking CQ+ so we can test this speculative fix ASAP. 1781489 6 ews-feeder 2021-08-02 17:55:13 -0700 Committed r280574 (240196@main): <https://commits.webkit.org/240196@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434789. 434789 2021-08-02 14:40:06 -0700 2021-08-02 19:26:49 -0700 Patch v1.0 bug-228716-20210802144005.patch text/plain 3289 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm MjYyYTFkNzAwMWI4ZTU3N2FlMWYyNTUwMDc2ZDhjNTI2MzY0YTdjLi41ZWMzYjVmNmFiM2RhN2Ri ODI5OWVlOGU0ZTUyZTIyNGYwNDgyNzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMS0wOC0wMiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW0FwcGxlV2luXSBTcGVjdWxhdGl2ZSBpbnRlcm5h bCBidWlsZCBmaXggZm9yIGNvcHlpbmcgYEluc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qc2AKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODcxNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZl IGZpeCBmb3IgQXBwbGVXaW4gcG9ydCBpbnRlcm5hbCBidWlsZCBieSB1c2luZyB0aGUgY29ycmVj dCBkaXJlY3RvcnkgZm9yIEpTQyBoZWFkZXJzLiBBbHNvIHVwZGF0ZSB0aGUKKyAgICAgICAgbG9n Z2luZyBtZXNzYWdlIHRvIHJlZmxlY3QgdGhhdCB0aGUgZmlsZSB3aWxsIGJ5IGNvcGllZCBsYXRl ciBpbiB0aGUgYnVpbGQuCisKKyAgICAgICAgKiBXZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYklu c3BlY3RvclVJLm1ha2U6CisgICAgICAgICogV2ViSW5zcGVjdG9yVUkudmN4cHJvai9idWlsZC13 ZWJpbnNwZWN0b3J1aS5wbDoKKwogMjAyMS0wNy0yNiAgUWlhb3NvbmcgWmhvdSAgPHFpYW9zb25n X3pob3VAYXBwbGUuY29tPgogCiAgICAgICAgIEZvcm1EYXRhRXZlbnQgYWRkZWQuIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5z cGVjdG9yVUkubWFrZSBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hw cm9qL1dlYkluc3BlY3RvclVJLm1ha2UKaW5kZXggNjNmYzEzZGExZWM5MGZmNWEwMTc4NTVmYmNj MTE5MzVjN2U5YTQzMC4uMWVkNmFjOTFhMWViNzU1MmE2OTJmNGZlNjhlZDY1OWYyODEyMzRhZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ov V2ViSW5zcGVjdG9yVUkubWFrZQorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVj dG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS5tYWtlCkBAIC05LDcgKzksNyBAQCBtYWtlOgog CUB4Y29weSAveSAvZSAiLi5cVXNlckludGVyZmFjZVwqIiAiJUNvbmZpZ3VyYXRpb25CdWlsZERp ciVcYmluJVBsYXRmb3JtQXJjaGl0ZWN0dXJlJVxXZWJLaXQucmVzb3VyY2VzXFdlYkluc3BlY3Rv clVJIg0KIAlpZiBlcnJvcmxldmVsIDEgZXhpdCAxDQogDQotCUB4Y29weSAveSAvZSAiLi5cQXBw bGVJbnRlcm5hbFxpbmNsdWRlXHByaXZhdGVcSmF2YVNjcmlwdENvcmVcaW5zcGVjdG9yXEluc3Bl Y3RvckJhY2tlbmRDb21tYW5kcy5qcyIgIiVDb25maWd1cmF0aW9uQnVpbGREaXIlXGJpbiVQbGF0 Zm9ybUFyY2hpdGVjdHVyZSVcV2ViS2l0LnJlc291cmNlc1xXZWJJbnNwZWN0b3JVSVxQcm90b2Nv bCINCisJQHhjb3B5IC95IC9lICIlSkFWQVNDUklQVENPUkVfUFJJVkFURV9IRUFERVJTX0RJUiVc aW5zcGVjdG9yXEluc3BlY3RvckJhY2tlbmRDb21tYW5kcy5qcyIgIiVDb25maWd1cmF0aW9uQnVp bGREaXIlXGJpbiVQbGF0Zm9ybUFyY2hpdGVjdHVyZSVcV2ViS2l0LnJlc291cmNlc1xXZWJJbnNw ZWN0b3JVSVxQcm90b2NvbCINCiAJaWYgZXJyb3JsZXZlbCAxIGV4aXQgMQ0KIA0KIAlpZiBleGlz dCAiJUNPTkZJR1VSQVRJT05CVUlMRERJUiVcYnVpbGRmYWlsZWQiIGRlbCAiJUNPTkZJR1VSQVRJ T05CVUlMRERJUiVcYnVpbGRmYWlsZWQiDQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovYnVpbGQtd2ViaW5zcGVjdG9ydWkucGwgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9idWlsZC13ZWJpbnNwZWN0 b3J1aS5wbAppbmRleCBmNGE0MTliOGZkZjJmZDRiYzMzOWQyNTNhYzM1NWFlZGMwOWVlODQ3Li4y YmQyNmRhZjE1MjNjYjk2ZTg4OWVhYTBjOWM4MDEzMmIyNjBiN2IxIDEwMDc1NQotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9idWlsZC13ZWJpbnNwZWN0 b3J1aS5wbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJv ai9idWlsZC13ZWJpbnNwZWN0b3J1aS5wbApAQCAtNzUsOSArNzUsOSBAQCBteSAkdGFyZ2V0UmVz b3VyY2VQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRFTlZ7J1RBUkdFVF9CVUlMRF9ESVInfSwg JEVOVnsnVU5MTwogbXkgJHByb3RvY29sRGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCR0YXJnZXRS ZXNvdXJjZVBhdGgsICdQcm90b2NvbCcpOwogCiAjIENvcHkgb3ZlciBkeW5hbWljYWxseSBsb2Fk ZWQgZmlsZXMgZnJvbSBvdGhlciBmcmFtZXdvcmtzLCBldmVuIGlmIHdlIGFyZW4ndCBjb21iaW5p bmcgcmVzb3VyY2VzLgotbXkgJGpzRnJvbSA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJEVOVnsnSkFW QVNDUklQVENPUkVfUFJJVkFURV9IRUFERVJTX0RJUid9LCAnSW5zcGVjdG9yQmFja2VuZENvbW1h bmRzLmpzJyk7CitteSAkanNGcm9tID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShGaWxlOjpTcGVjLT5j YXRkaXIoJEVOVnsnSkFWQVNDUklQVENPUkVfUFJJVkFURV9IRUFERVJTX0RJUid9LCAnaW5zcGVj dG9yJyksICdJbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMnKTsKIG15ICRqc1RvID0gRmlsZTo6 U3BlYy0+Y2F0ZmlsZSgkcHJvdG9jb2xEaXIsICdJbnNwZWN0b3JCYWNrZW5kQ29tbWFuZHMuanMn KTsKLXByaW50ICJDb3B5aW5nIEluc3BlY3RvciBiaW5kaW5ncyBmcm9tICRqc0Zyb20gdG8gJGpz VG9cbiI7CitwcmludCAiSW5zcGVjdG9yIGJpbmRpbmdzIHdpbGwgYmUgY29waWVkIGZyb20gJGpz RnJvbSB0byAkanNUb1xuIjsKIAogbXkgJGNvcHlSZXNvdXJjZXNDb21tYW5kID0gRmlsZTo6U3Bl Yy0+Y2F0ZmlsZSgkWFNSQ1JPT1QsICdTY3JpcHRzJywgJ2NvcHktdXNlci1pbnRlcmZhY2UtcmVz b3VyY2VzLnBsJyk7CiBkbyAkY29weVJlc291cmNlc0NvbW1hbmQ7Cg==