Bug 211102 – [MacCatalyst] Add missing symlinks to WebKit.frameworks

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[David Kilzer (:ddkilzer)]

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>

[David Kilzer (:ddkilzer)]

Created attachment 397777 [details]
Patch v1

[Alexey Proskuryakov]

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?

[David Kilzer (:ddkilzer)]

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.

[Alexey Proskuryakov]

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.

[Brent Fulgham]

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.

[EWS]

Committed r260842: <https://trac.webkit.org/changeset/260842>

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