Bug 194411 – [Mac] WebInspectorUI.framework does not need to be soft-linked anymore

• Component: Web Inspector
• Status: RESOLVED FIXED

[Blaze Burg]

This was re-added by https://bugs.webkit.org/show_bug.cgi?id=118544. It is no longer needed.

[Blaze Burg]

<rdar://problem/47787614>

[Blaze Burg]

Created attachment 361440 [details]
Patch

[Joseph Pecoraro]

Comment on attachment 361440 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=361440&action=review

> Source/WebKit/Configurations/WebKit.xcconfig:131
> +WK_WEBINSPECTORUI_LDFLAGS = $(WK_WEBINSPECTORUI_LDFLAGS_$(WK_PLATFORM_NAME));
> +WK_WEBINSPECTORUI_LDFLAGS_macosx = -framework WebInspectorUI;

I don't think we can hard link WebInspectorUI as it doesn't look like WebInspectorUI.framework is available in the Base System.

[Joseph Pecoraro]

Comment on attachment 361440 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=361440&action=review

>> Source/WebKit/Configurations/WebKit.xcconfig:131
>> +WK_WEBINSPECTORUI_LDFLAGS_macosx = -framework WebInspectorUI;
> 
> I don't think we can hard link WebInspectorUI as it doesn't look like WebInspectorUI.framework is available in the Base System.

Correction: is *not* available

[Darin Adler]

Comment on attachment 361440 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=361440&action=review

>>> Source/WebKit/Configurations/WebKit.xcconfig:131
>>> +WK_WEBINSPECTORUI_LDFLAGS_macosx = -framework WebInspectorUI;
>> 
>> I don't think we can hard link WebInspectorUI as it doesn't look like WebInspectorUI.framework is available in the Base System.
> 
> Correction: is *not* available

So we could consider switching from soft linking to weak linking.

[Joseph Pecoraro]

Good point, weak linking should work.

[Blaze Burg]

Reopening to try -weak_framework based approach.

[Blaze Burg]

Created attachment 362046 [details]
Patch

[Joseph Pecoraro]

Comment on attachment 362046 [details]
Patch

r=me

[Blaze Burg]

Created attachment 362056 [details]
Patch

[Joseph Pecoraro]

Comment on attachment 362056 [details]
Patch

r=me still =)

[Blaze Burg]

Committed r241564: <https://trac.webkit.org/changeset/241564>

[Truitt Savell]

After the changes in https://trac.webkit.org/changeset/241564/webkit

Mac WK2 has 50+ Timeouts and is exiting early. These are mostly in the http/ directory. 

Results:
https://build.webkit.org/results/Apple%20Mojave%20Release%20WK2%20(Tests)/r241565%20(2502)/results.html

Build:
https://build.webkit.org/builders/Apple%20Mojave%20Release%20WK2%20%28Tests%29/builds/2502

Confirmed this locally with:
run-webkit-tests --root testbuild-241564 http/ -f

Timeouts occur throughout the directory on 241564 but not on 241563

[Truitt Savell]

Reverted r241564 for reason:

Caused 50+ Timeouts on Mac WK2, mostly in the http/ directory

Committed r241586: <https://trac.webkit.org/changeset/241586>

[Blaze Burg]

Comment on attachment 362056 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=362056&action=review

> Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm:743
> +    NSString *path = [bundle pathForResource:@"Main" ofType:@"html"];

When splitting up this line, I introduced a typo. Tests fail because it isn't loading Test.html. I must have run WKTR against a stale build, or something.

[Blaze Burg]

Created attachment 362126 [details]
Patch

[Blaze Burg]

Committed r241597: <https://trac.webkit.org/changeset/241597>