Bug 206463 – Fix SDK availability macros

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Keith Rollin]

Bug 202243 (fixed in r252174) updated our availability macros for macOS 10.15 and iOS 13. However, some of the changes were not correct at this time and prevent the processing of the macros when building the macOS 10.15 (and, presumably, iOS 13) SDKs. Revert the relevant changes.

[Keith Rollin]

<rdar://problem/58581906>

[Keith Rollin]

> and, presumably, iOS 13

No. This was OK. I think. I'll check.

[Keith Rollin]

.../System/Library/Frameworks/WebKit.framework/Headers/WKURLSchemeHandler.h has the expected contents.

[Keith Rollin]

Created attachment 388329 [details]
Patch

[Timothy Hatcher]

Comment on attachment 388329 [details]
Patch

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

> Source/WebKit/ChangeLog:11
> +        overs our exported headers, changing macros like WK_API_AVAILABLE to

s/overs/over/

[Keith Rollin]

Created attachment 388333 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 388333 [details]
Patch

Clearing flags on attachment: 388333

Committed r254876: <https://trac.webkit.org/changeset/254876>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Ryan Haddad]

Catalina Release/Debug builds are failing after this change:

/Volumes/Data/slave/catalina-debug/build/WebKitBuild/Debug/WebKit.framework/Headers/WKFoundation.h:35:9: error: 'API_AVAILABLE' macro redefined [-Werror,-Wmacro-redefined]
/Volumes/Data/slave/catalina-debug/build/WebKitBuild/Debug/WebKit.framework/Headers/WKFoundation.h:37:9: error: 'API_DEPRECATED' macro redefined [-Werror,-Wmacro-redefined]
/Volumes/Data/slave/catalina-debug/build/WebKitBuild/Debug/WebKit.framework/Headers/WKFoundation.h:38:9: error: 'API_DEPRECATED_WITH_REPLACEMENT' macro redefined [-Werror,-Wmacro-redefined]

https://build.webkit.org/builders/Apple-Catalina-Debug-Build/builds/2793

[Ryan Haddad]

Reverted r254876 for reason:

Broke Catalina builds.

Committed r254879: <https://trac.webkit.org/changeset/254879>

[Keith Rollin]

Created attachment 388454 [details]
Patch

[Keith Rollin]

From an internal chat regarding this issue:

OK, I think I have it worked out. The problem is with a file we export called WKFoundation.h This file gets exported and then post-processed. The change I made concerns how its post-processed. The file *was* getting post-processed incorrectly; my change was to fix that and get it to be processed correctly. The problem with an incremental build is that this file continues to exist at its exported location and in its (incorrectly) post-processed state. Because it has a timestamp newer than the original pre-exported, pre-processed versions, the file will not get cleaned up according to the new post-processing rules. This state of things then leads a subsequent header-file-post-processor to come along and mangle the file even more, leading to the build error.

I can fix this by touching WKFoundation.h when I re-upload my patch. This will get a new, clean copy to get exported, and then post-processed correctly.

[WebKit Commit Bot]

Comment on attachment 388454 [details]
Patch

Clearing flags on attachment: 388454

Committed r254938: <https://trac.webkit.org/changeset/254938>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.