Expand SUPPORTED_PLATFORMS to include visionOS in Tools and various o…

…ther places https://bugs.webkit.org/show_bug.cgi?id=271067 rdar://124702757 Reviewed by Richard Robinson and Megan Gardner. * Source/ThirdParty/gmock/Configurations/Base.xcconfig: * Tools/DumpRenderTree/mac/Configurations/Base.xcconfig: * Tools/ImageDiff/cg/Configurations/Base.xcconfig: * Tools/MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig: * Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig: Some ways of building depend on SUPPORTED_PLATFORMS being correct, or they fall back to building into iOS directories (which then fails because the dependencies are missing). * Tools/MobileMiniBrowser/MobileMiniBrowserFramework/AppDelegate.m: (-[AppDelegate application:didFinishLaunchingWithOptions:]): * Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m: (-[WebViewController viewDidLoad]): Wrap some deprecation warnings. Canonical link: https://commits.webkit.org/276192@main
WebKit · Mar 15, 2024 · 2a2314b · 2a2314b
1 parent 5680a73
commit 2a2314b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/Source/ThirdParty/gmock/Configurations/Base.xcconfig b/Source/ThirdParty/gmock/Configurations/Base.xcconfig
@@ -85,7 +85,7 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 PREBINDING = NO;
 WARNING_CFLAGS = $(inherited) -Wcast-qual -Wchar-subscripts -Wextra-tokens -Winit-self -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion -Wthread-safety -Wno-comma -Wno-exit-time-destructors -Wno-global-constructors -Wno-inconsistent-missing-override -Wno-missing-prototypes -Wno-undef;
 
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator xros xrsimulator;
 SUPPORTS_MACCATALYST = YES;
 
 DEAD_CODE_STRIPPING = NO;

diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
@@ -83,7 +83,7 @@ ADDITIONAL_SDKS = $(WK_ADDITIONAL_SDKS);
 AD_HOC_CODE_SIGNING_ALLOWED = YES;
 CODE_SIGN_IDENTITY = -;
 
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator xros xrsimulator;
 SUPPORTS_MACCATALYST = YES;
 
 OTHER_CFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;

diff --git a/Tools/ImageDiff/cg/Configurations/Base.xcconfig b/Tools/ImageDiff/cg/Configurations/Base.xcconfig
@@ -72,5 +72,5 @@ ADDITIONAL_SDKS = $(WK_ADDITIONAL_SDKS);
 
 AD_HOC_CODE_SIGNING_ALLOWED = YES;
 
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator xros xrsimulator;
 SUPPORTS_MACCATALYST = YES;
diff --git a/Tools/MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig b/Tools/MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig
@@ -23,4 +23,4 @@
 
 PRODUCT_NAME = MiniBrowser
 STRIP_STYLE=debugging
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator xros xrsimulator;
diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/AppDelegate.m b/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/AppDelegate.m
@@ -34,8 +34,11 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     UIStoryboard *frameworkMainStoryboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle bundleForClass:[AppDelegate class]]];
     WebViewController *viewController = [frameworkMainStoryboard instantiateInitialViewController];
+#pragma clang diagnostic pop
     if (!viewController)
         return NO;
 

diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m b/Tools/MobileMiniBrowser/MobileMiniBrowserFramework/WebViewController.m
@@ -75,11 +75,17 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     self.webViews = [[NSMutableArray alloc] initWithCapacity:1];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     self.tabViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"idTabViewController"];
+#pragma clang diagnostic pop
     self.tabViewController.parent = self;
     self.tabViewController.modalPresentationStyle = UIModalPresentationPopover;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     self.settingsViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"idSettingsViewController"];
+#pragma clang diagnostic pop
     self.settingsViewController.parent = self;
     self.settingsViewController.modalPresentationStyle = UIModalPresentationPopover;
 

diff --git a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
@@ -85,7 +85,7 @@ WK_FIXME_WARNING_CFLAGS = -Wno-unused-parameter -Wno-unused-private-field -Wno-u
 
 HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include;
 
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator xros xrsimulator;
 
 DEAD_CODE_STRIPPING = YES;
 DEAD_CODE_STRIPPING[config=Debug] = NO;