| Summary: | Update TBA macros for API / SPI that has already shipped | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Chris Dumez <cdumez> | ||||||||||||
| Component: | WebKit2 | Assignee: | Chris Dumez <cdumez> | ||||||||||||
| Status: | RESOLVED FIXED | ||||||||||||||
| Severity: | Normal | CC: | achristensen, ap, commit-queue, ggaren, krollin, mitz, thorton, webkit-bug-importer | ||||||||||||
| Priority: | P2 | Keywords: | InRadar | ||||||||||||
| Version: | WebKit Nightly Build | ||||||||||||||
| Hardware: | Unspecified | ||||||||||||||
| OS: | Unspecified | ||||||||||||||
| Attachments: |
|
||||||||||||||
|
Description
Chris Dumez
2019-05-13 09:57:09 PDT
Created attachment 369740 [details]
Patch
Comment on attachment 369740 [details] Patch Clearing flags on attachment: 369740 Committed r245240: <https://trac.webkit.org/changeset/245240> All reviewed patches have been landed. Closing bug. Reverted r245240 for reason: Broke the build Committed r245245: <https://trac.webkit.org/changeset/245245> (In reply to Chris Dumez from comment #5) > Reverted r245240 for reason: > > Broke the build > > Committed r245245: <https://trac.webkit.org/changeset/245245> /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m:111:17: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m:111:84: error: '_internalDebugFeatures' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m:112:14: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m:118:40: error: '_setEnabled:forInternalDebugFeature:' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:226:13: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:226:80: error: '_internalDebugFeatures' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:228:10: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:312:9: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:313:50: error: '_isEnabledForInternalDebugFeature:' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:652:5: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:655:42: error: '_isEnabledForInternalDebugFeature:' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/SettingsController.m:656:18: error: '_setEnabled:forInternalDebugFeature:' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/WK2BrowserWindowController.m:209:37: error: '_inspector' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/WK2BrowserWindowController.m:289:5: error: '_WKInspector' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/WK2BrowserWindowController.m:289:40: error: '_inspector' is only available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] (In reply to Chris Dumez from comment #6) > (In reply to Chris Dumez from comment #5) > > Reverted r245240 for reason: > > > > Broke the build > > > > Committed r245245: <https://trac.webkit.org/changeset/245245> > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > 111:17: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 > or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > 111:84: error: '_internalDebugFeatures' is only available on macOS 10.14.4 > or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > 112:14: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 > or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > 118:40: error: '_setEnabled:forInternalDebugFeature:' is only available on > macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:226:13: error: '_WKInternalDebugFeature' is only > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:226:80: error: '_internalDebugFeatures' is only > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:228:10: error: '_WKInternalDebugFeature' is only > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:312:9: error: '_WKInternalDebugFeature' is only > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:313:50: error: '_isEnabledForInternalDebugFeature:' is > only available on macOS 10.14.4 or newer > [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:652:5: error: '_WKInternalDebugFeature' is only > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:655:42: error: '_isEnabledForInternalDebugFeature:' is > only available on macOS 10.14.4 or newer > [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > SettingsController.m:656:18: error: '_setEnabled:forInternalDebugFeature:' > is only available on macOS 10.14.4 or newer > [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > WK2BrowserWindowController.m:209:37: error: '_inspector' is only available > on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > WK2BrowserWindowController.m:289:5: error: '_WKInspector' is only available > on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > WK2BrowserWindowController.m:289:40: error: '_inspector' is only available > on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] Was this before or after disabling postprocessing for 10.14? Perhaps MiniBrowser needs to disable checking availability annotations? It needs to build and to use trunk features on 10.13.6 anyway, so seems like it has to ignore the annotations. (In reply to mitz from comment #7) > (In reply to Chris Dumez from comment #6) > > (In reply to Chris Dumez from comment #5) > > > Reverted r245240 for reason: > > > > > > Broke the build > > > > > > Committed r245245: <https://trac.webkit.org/changeset/245245> > > > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > > 111:17: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 > > or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > > 111:84: error: '_internalDebugFeatures' is only available on macOS 10.14.4 > > or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > > 112:14: error: '_WKInternalDebugFeature' is only available on macOS 10.14.4 > > or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/AppDelegate.m: > > 118:40: error: '_setEnabled:forInternalDebugFeature:' is only available on > > macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:226:13: error: '_WKInternalDebugFeature' is only > > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:226:80: error: '_internalDebugFeatures' is only > > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:228:10: error: '_WKInternalDebugFeature' is only > > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:312:9: error: '_WKInternalDebugFeature' is only > > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:313:50: error: '_isEnabledForInternalDebugFeature:' is > > only available on macOS 10.14.4 or newer > > [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:652:5: error: '_WKInternalDebugFeature' is only > > available on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:655:42: error: '_isEnabledForInternalDebugFeature:' is > > only available on macOS 10.14.4 or newer > > [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > SettingsController.m:656:18: error: '_setEnabled:forInternalDebugFeature:' > > is only available on macOS 10.14.4 or newer > > [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > WK2BrowserWindowController.m:209:37: error: '_inspector' is only available > > on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > WK2BrowserWindowController.m:289:5: error: '_WKInspector' is only available > > on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > /Volumes/Data/slave/mojave-debug/build/Tools/MiniBrowser/mac/ > > WK2BrowserWindowController.m:289:40: error: '_inspector' is only available > > on macOS 10.14.4 or newer [-Werror,-Wunguarded-availability-new] > > Was this before or after disabling postprocessing for 10.14? That was before since my other patch has not landed yet. That said, I am not sure this is the issue because: 1. I have not updated the versions TBA resolve to yet. 2. The SPIs it is complaining about are no longer TBA in my patch. Created attachment 369783 [details]
Patch
*** Bug 197846 has been marked as a duplicate of this bug. *** Ok, I merged Bug 197846 into this as it seems we need to land both changes at the same time. Comment on attachment 369783 [details]
Patch
r=me
Looks like iOS is unhappy Created attachment 369800 [details]
Patch
Comment on attachment 369800 [details]
Patch
Looks like iOS is still unhappy.
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:73:28: error: expected ';' after method prototype
- (void)_warmInitialProcess WK_API_AVAILABLE(macos(10.12), ios(10.0));
^
;
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:74:41: error: expected ';' after method prototype
- (void)_automationCapabilitiesDidChange WK_API_AVAILABLE(macos(10.12), ios(10.0));
^
;
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:75:89: error: expected ':'
- (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_API_AVAILABLE(macos(10.12), ios(10.0));
^
:
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:75:89: error: expected ';' after method prototype
- (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_API_AVAILABLE(macos(10.12), ios(10.0));
^
;
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:77:185: error: expected ':'
- (void)_addSupportedPlugin:(NSString *) domain named:(NSString *) name withMimeTypes: (NSSet<NSString *> *) mimeTypes withExtensions: (NSSet<NSString *> *) extensions WK_API_AVAILABLE(macos(10.14), ios(12.0));
^
:
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:77:185: error: expected ';' after method prototype
- (void)_addSupportedPlugin:(NSString *) domain named:(NSString *) name withMimeTypes: (NSSet<NSString *> *) mimeTypes withExtensions: (NSSet<NSString *> *) extensions WK_API_AVAILABLE(macos(10.14), ios(12.0));
^
;
/Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:78:31: error: expected ';' after method prototype
- (void)_clearSupportedPlugins WK_API_AVAILABLE(macos(10.14), ios(12.0));
^
;
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.
Comment on attachment 369800 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369800&action=review > Source/WebKit/Configurations/WebKit.xcconfig:163 > +WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*12.*] = YES; I thought this would take care of the issues on iOS but it did not. Created attachment 369856 [details]
Patch
(In reply to Chris Dumez from comment #17) > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:73:28: > error: expected ';' after method prototype > - (void)_warmInitialProcess WK_API_AVAILABLE(macos(10.12), ios(10.0)); > ^ > ; > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:74:41: > error: expected ';' after method prototype > - (void)_automationCapabilitiesDidChange WK_API_AVAILABLE(macos(10.12), > ios(10.0)); > ^ > ; > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:75:89: > error: expected ':' > - (void)_setAutomationSession:(_WKAutomationSession *)automationSession > WK_API_AVAILABLE(macos(10.12), ios(10.0)); > > ^ > > : > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:75:89: > error: expected ';' after method prototype > - (void)_setAutomationSession:(_WKAutomationSession *)automationSession > WK_API_AVAILABLE(macos(10.12), ios(10.0)); > > ^ > > ; > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:77: > 185: error: expected ':' > - (void)_addSupportedPlugin:(NSString *) domain named:(NSString *) name > withMimeTypes: (NSSet<NSString *> *) mimeTypes withExtensions: > (NSSet<NSString *> *) extensions WK_API_AVAILABLE(macos(10.14), ios(12.0)); > > ^ > > : > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:77: > 185: error: expected ';' after method prototype > - (void)_addSupportedPlugin:(NSString *) domain named:(NSString *) name > withMimeTypes: (NSSet<NSString *> *) mimeTypes withExtensions: > (NSSet<NSString *> *) extensions WK_API_AVAILABLE(macos(10.14), ios(12.0)); > > ^ > > > ; > /Volumes/Data/worker/iOS-12-Simulator-Build-EWS/build/WebKitBuild/Release- > iphonesimulator/WebKit.framework/PrivateHeaders/WKProcessPoolPrivate.h:78:31: > error: expected ';' after method prototype > - (void)_clearSupportedPlugins WK_API_AVAILABLE(macos(10.14), ios(12.0)); > ^ > ; > fatal error: too many errors emitted, stopping now [-ferror-limit=] > 20 errors generated. Trying to fix this by adding #import <WebKit/WKFoundation.h> If anybody has an idea to fix iOS EWS, please let me know. Keith just did a local iOS 12 simulator build with my patch and it built. I have no idea why EWS is having trouble. It looks like it is not finding the WK_API_AVAILABLE define, even though it is supposed to come from WKFoundation.h to be a no-op. (In reply to Chris Dumez from comment #21) > If anybody has an idea to fix iOS EWS, please let me know. Keith just did a > local iOS 12 simulator build with my patch and it built. I have no idea why > EWS is having trouble. It looks like it is not finding the WK_API_AVAILABLE > define, even though it is supposed to come from WKFoundation.h to be a no-op. You may want to force a clean build on the EWS machine (or touch WKFoundation.h in your patch) because otherwise the postprocessed header might not get replaced by the unprocessed one when you disable postprocessing in the xcconfig. Created attachment 369868 [details]
Patch
(In reply to mitz from comment #22) > (In reply to Chris Dumez from comment #21) > > If anybody has an idea to fix iOS EWS, please let me know. Keith just did a > > local iOS 12 simulator build with my patch and it built. I have no idea why > > EWS is having trouble. It looks like it is not finding the WK_API_AVAILABLE > > define, even though it is supposed to come from WKFoundation.h to be a no-op. > > You may want to force a clean build on the EWS machine (or touch > WKFoundation.h in your patch) because otherwise the postprocessed header > might not get replaced by the unprocessed one when you disable > postprocessing in the xcconfig. Yoohoo, it looks like this did the trick. Thanks. Comment on attachment 369868 [details] Patch Clearing flags on attachment: 369868 Committed r245294: <https://trac.webkit.org/changeset/245294> All reviewed patches have been landed. Closing bug. |