| Summary: | [Mac] WebInspectorUI.framework does not need to be soft-linked anymore | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | BJ Burg <bburg> | ||||||||||
| Component: | Web Inspector | Assignee: | BJ Burg <bburg> | ||||||||||
| Status: | RESOLVED FIXED | ||||||||||||
| Severity: | Normal | CC: | bburg, benjamin, cdumez, cmarcelo, darin, dbates, ddkilzer, ews-watchlist, inspector-bugzilla-changes, jberlin, joepeck, tsavell, webkit-bug-importer | ||||||||||
| Priority: | P2 | Keywords: | InRadar | ||||||||||
| Version: | WebKit Nightly Build | ||||||||||||
| Hardware: | All | ||||||||||||
| OS: | All | ||||||||||||
| Attachments: |
|
||||||||||||
|
Description
BJ Burg
2019-02-07 13:30:24 PST
Created attachment 361440 [details]
Patch
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. 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 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. Good point, weak linking should work. Reopening to try -weak_framework based approach. Created attachment 362046 [details]
Patch
Comment on attachment 362046 [details]
Patch
r=me
Created attachment 362056 [details]
Patch
Comment on attachment 362056 [details]
Patch
r=me still =)
Committed r241564: <https://trac.webkit.org/changeset/241564> 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 Reverted r241564 for reason: Caused 50+ Timeouts on Mac WK2, mostly in the http/ directory Committed r241586: <https://trac.webkit.org/changeset/241586> 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. Created attachment 362126 [details]
Patch
Committed r241597: <https://trac.webkit.org/changeset/241597> |