Bug 228716 - Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
Summary: Web Inspector: [AppleWin] Speculative internal build fix for copying `Inspect...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Web Inspector (show other bugs)
Version: WebKit Nightly Build
Hardware: All All
: P2 Normal
Assignee: Patrick Angle
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2021-08-02 14:36 PDT by Patrick Angle
Modified: 2021-08-02 19:26 PDT (History)
6 users (show)

See Also:


Attachments
Patch v1.0 (3.21 KB, patch)
2021-08-02 14:40 PDT, Patrick Angle
ews-feeder: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Patrick Angle 2021-08-02 14:36:45 PDT
<rdar://81329155>
Comment 1 Patrick Angle 2021-08-02 14:40:06 PDT
Created attachment 434789 [details]
Patch v1.0
Comment 2 Per Arne Vollan 2021-08-02 16:05:08 PDT
Comment on attachment 434789 [details]
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?
Comment 3 Patrick Angle 2021-08-02 16:12:02 PDT
Comment on attachment 434789 [details]
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.
Comment 4 Maciej Stachowiak 2021-08-02 17:14:00 PDT
Comment on attachment 434789 [details]
Patch v1.0

I'm not totally clear on why this broke or why this change fixes it, but it seems reasonable to try.
Comment 5 Maciej Stachowiak 2021-08-02 17:20:14 PDT
Comment on attachment 434789 [details]
Patch v1.0

Marking CQ+ so we can test this speculative fix ASAP.
Comment 6 EWS 2021-08-02 17:55:13 PDT
Committed r280574 (240196@main): <https://commits.webkit.org/240196@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434789 [details].