Bug 211102 - [MacCatalyst] Add missing symlinks to WebKit.frameworks
Summary: [MacCatalyst] Add missing symlinks to WebKit.frameworks
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: David Kilzer (:ddkilzer)
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2020-04-27 16:35 PDT by David Kilzer (:ddkilzer)
Modified: 2020-04-28 12:53 PDT (History)
5 users (show)

See Also:


Attachments
Patch v1 (4.31 KB, patch)
2020-04-27 18:15 PDT, David Kilzer (:ddkilzer)
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 2020-04-27 16:35:26 PDT
Add missing symlinks to WebKit.frameworks.

The MacCatalyst build is missing the /System/iOSSupport/System/Library/Frameworks/WebKit.framework/{Frameworks,XPCServices} symlinks the the macOS build has.

<rdar://problem/62137758>
Comment 1 David Kilzer (:ddkilzer) 2020-04-27 18:15:15 PDT
Created attachment 397777 [details]
Patch v1
Comment 2 Alexey Proskuryakov 2020-04-27 19:57:27 PDT
Comment on attachment 397777 [details]
Patch v1

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

> Source/WebKit/WebKit.xcodeproj/project.pbxproj:12143
> +			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == macosx || \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\n    ln -sfh \"Versions/Current/Frameworks\" \"${TARGET_BUILD_DIR}/WebKit.framework/Frameworks\"\nfi\n";

Why both iosmac and maccatalyst?
Comment 3 David Kilzer (:ddkilzer) 2020-04-28 10:32:50 PDT
Comment on attachment 397777 [details]
Patch v1

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

>> Source/WebKit/WebKit.xcodeproj/project.pbxproj:12143
>> +			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == macosx || \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\n    ln -sfh \"Versions/Current/Frameworks\" \"${TARGET_BUILD_DIR}/WebKit.framework/Frameworks\"\nfi\n";
> 
> Why both iosmac and maccatalyst?

For consistency with the same check in Source/Webkit/Scripts/process-entitlements.sh.
Comment 4 Alexey Proskuryakov 2020-04-28 10:54:24 PDT
I think that is obsolete and shouldn't be propagated, but will leave review to people who know a bit more about macCatalyst than I do.
Comment 5 Brent Fulgham 2020-04-28 11:17:09 PDT
Comment on attachment 397777 [details]
Patch v1

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

>>> Source/WebKit/WebKit.xcodeproj/project.pbxproj:12143
>>> +			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == macosx || \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\n    ln -sfh \"Versions/Current/Frameworks\" \"${TARGET_BUILD_DIR}/WebKit.framework/Frameworks\"\nfi\n";
>> 
>> Why both iosmac and maccatalyst?
> 
> For consistency with the same check in Source/Webkit/Scripts/process-entitlements.sh.

We should get rid of the iosmac stuff in a future patch.
Comment 6 EWS 2020-04-28 12:53:46 PDT
Committed r260842: <https://trac.webkit.org/changeset/260842>

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