diff --git a/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig index ee3991600b02..85bcd5a7956d 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig +++ b/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig @@ -48,7 +48,7 @@ WK_CCACHE_DIR = $(SRCROOT)/../../../Tools/ccache; #include "../../../../Tools/ccache/ccache.xcconfig" OTHER_LDFLAGS[config=Debug][sdk=iphone*] = $(inherited) -framework UIKit -framework CoreGraphics -OTHER_LDFLAGS[config=Debug][sdk=tv*] = $(inherited) -framework UIKit -framework CoreGraphics +OTHER_LDFLAGS[config=Debug][sdk=appletv*] = $(inherited) -framework UIKit -framework CoreGraphics OTHER_LDFLAGS[config=Debug][sdk=watch*] = $(inherited) -framework UIKit -framework CoreGraphics OTHER_LDFLAGS[config=Debug][sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_$(WK_IS_CATALYST)) OTHER_LDFLAGS_YES = -framework UIKit -framework CoreGraphics diff --git a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig index 22ff8cd56d98..7b4fd3f6aace 100644 --- a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig +++ b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig @@ -28,6 +28,10 @@ PRODUCT_NAME = DumpRenderTree; SKIP_INSTALL = YES; +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; + OTHER_LDFLAGS = ; EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH)) $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM)); diff --git a/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig b/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig index 8c98f99dcc30..6cdc55ef9d93 100644 --- a/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig +++ b/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig @@ -28,6 +28,10 @@ OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit; STRIP_STYLE = debugging; +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; + EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM)); EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = WebKit.framework; diff --git a/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj b/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj index df157b36907c..00cad69666ee 100644 --- a/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj +++ b/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj @@ -6,6 +6,20 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + DD403C872851B13F00D899FC /* MiniBrowser (Mac-only) */ = { + isa = PBXAggregateTarget; + buildConfigurationList = DD403C8A2851B13F00D899FC /* Build configuration list for PBXAggregateTarget "MiniBrowser (Mac-only)" */; + buildPhases = ( + ); + dependencies = ( + DD403C8C2851B14300D899FC /* PBXTargetDependency */, + ); + name = "MiniBrowser (Mac-only)"; + productName = "MiniBrowser (Mac-only)"; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 0FE643A1161FA8940059E3FF /* BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FE643A0161FA8940059E3FF /* BrowserWindowController.m */; }; 0FE643A4161FAC660059E3FF /* WK1BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FE643A3161FAC660059E3FF /* WK1BrowserWindowController.m */; }; @@ -19,8 +33,33 @@ BC329498116A941B008635D0 /* WK2BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC329497116A941B008635D0 /* WK2BrowserWindowController.m */; }; BC72B89511E57E07001EB4EA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58150DA1D0A300B32029 /* MainMenu.xib */; }; BC72B89611E57E0F001EB4EA /* BrowserWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC3294A2116A9852008635D0 /* BrowserWindow.xib */; }; + DD403C5528500F8C00D899FC /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DD403C5328500F6400D899FC /* WebKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + DD403C8B2851B14300D899FC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8D1107260486CEB800E47090; + remoteInfo = MiniBrowser; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + DD403C5228500F4300D899FC /* Product Dependencies */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 16; + files = ( + DD403C5528500F8C00D899FC /* WebKit.framework in Product Dependencies */, + ); + name = "Product Dependencies"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0FE6439F161FA8940059E3FF /* BrowserWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowserWindowController.h; path = mac/BrowserWindowController.h; sourceTree = ""; }; 0FE643A0161FA8940059E3FF /* BrowserWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BrowserWindowController.m; path = mac/BrowserWindowController.m; sourceTree = ""; }; @@ -53,6 +92,7 @@ BCA8CBDD11E578A000812FB7 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = ""; }; BCA8CBDE11E578A000812FB7 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = ""; }; BCA8CBDF11E578A000812FB7 /* MiniBrowser.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = MiniBrowser.xcconfig; sourceTree = ""; }; + DD403C5328500F6400D899FC /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -138,6 +178,7 @@ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, 1AFFEF761860EE6800DA465E /* Cocoa.framework */, 5C9332AE24C1349C0036DECE /* SecurityInterface.framework */, + DD403C5328500F6400D899FC /* WebKit.framework */, ); name = Frameworks; sourceTree = ""; @@ -160,6 +201,7 @@ isa = PBXNativeTarget; buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MiniBrowser" */; buildPhases = ( + DD403C5228500F4300D899FC /* Product Dependencies */, 8D1107290486CEB800E47090 /* Resources */, 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, @@ -204,6 +246,7 @@ projectRoot = ""; targets = ( 8D1107260486CEB800E47090 /* MiniBrowser */, + DD403C872851B13F00D899FC /* MiniBrowser (Mac-only) */, ); }; /* End PBXProject section */ @@ -239,6 +282,17 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + DD403C8C2851B14300D899FC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + platformFilters = ( + macos, + ); + target = 8D1107260486CEB800E47090 /* MiniBrowser */; + targetProxy = DD403C8B2851B14300D899FC /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; @@ -269,6 +323,18 @@ }; name = Release; }; + DD403C882851B13F00D899FC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + DD403C892851B13F00D899FC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -290,6 +356,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + DD403C8A2851B13F00D899FC /* Build configuration list for PBXAggregateTarget "MiniBrowser (Mac-only)" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DD403C882851B13F00D899FC /* Debug */, + DD403C892851B13F00D899FC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj b/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj index 387f06f5218e..bc7a49b0927e 100644 --- a/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj +++ b/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ CDA985191D76483400EBC399 /* test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CDA985151D76477900EBC399 /* test.mp4 */; }; CDA9851A1D76483400EBC399 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985131D76474100EBC399 /* index.html */; }; CDA9851B1D76483400EBC399 /* looping.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985171D7647CD00EBC399 /* looping.html */; }; + DD403C5828500FE300D899FC /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = CD1DAFC11D70E12D00017CF0 /* WebKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -58,6 +59,17 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + DD403C5728500FD800D899FC /* Product Dependencies */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 16; + files = ( + DD403C5828500FE300D899FC /* WebKit.framework in Product Dependencies */, + ); + name = "Product Dependencies"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -268,6 +280,7 @@ isa = PBXNativeTarget; buildConfigurationList = CD498B441D76348000681FA7 /* Build configuration list for PBXNativeTarget "MobileMiniBrowser.framework" */; buildPhases = ( + DD403C5728500FD800D899FC /* Product Dependencies */, CD498B361D76348000681FA7 /* Sources */, CD498B371D76348000681FA7 /* Frameworks */, CD498B381D76348000681FA7 /* Headers */, diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit index 00664ad09f90..3401b5cf9c25 100755 --- a/Tools/Scripts/build-webkit +++ b/Tools/Scripts/build-webkit @@ -74,7 +74,7 @@ my $coverageSupport = 0; my $shouldRunStaticAnalyzer = 0; my $noExperimentalFeatures = 0; my $ltoMode = "default"; -my $useWorkspace = undef; +my $useWorkspace = 1; my $startTime = time(); my $archs32bit = 0; my $skipLibraryUpdate = 0; @@ -122,7 +122,7 @@ Usage: $programName [options] [options to pass to build system] --coverage Enable code coverage support (Mac only) --analyze Enable static anaylsis (Apple platforms only) --lto-mode= Set Link Time Optimization mode (full, thin, or none) (LLVM only) - --[no-]use-workspace Use WebKit.xcworkspace and XCBuild (Apple platforms only) + --no-use-workspace Build projects one at a time instead of using WebKit.xcworkspace (Apple platforms only) --ftw Build the FTW Windows port --gtk Build the GTK+ port @@ -242,6 +242,10 @@ if (isAppleCocoaWebKit()) { # In workspaces, build order is determined by XCBuild. if (!$useWorkspace) { + print STDERR "warning: Building with --no-use-workspace is " . + "deprecated.\nIf you have a workflow requirement that depends " . + "on building targets in manual order, please document it in " . + "https://bugs.webkit.org/show_bug.cgi?id=241295.\n"; # ANGLE and libwebrtc must come before WebCore splice @projects, 0, 0, ("Source/ThirdParty/ANGLE"); # if (not $archs32bit and (portName() eq Mac or portName() eq iOS or portName() eq watchOS)) { diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 1128f951ecf4..4e509ebdc770 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -664,12 +664,28 @@ sub isValidXcodeSDKPlatformName($) { return grep { $_ eq $name } @platforms; } +sub genericDestinationForXcodeSDKPlatformName($) { + my $xcodeSDKPlatformName = shift; + my %destinations = ( + "appletvos" => "generic/platform=tvOS", + "appletvsimulator" => "generic/platform=tvOS Simulator", + "iphoneos" => "generic/platform=iOS", + "iphonesimulator" => "generic/platform=iOS Simulator", + "macosx" => "generic/platform=macOS", + "maccatalyst" => "generic/platform=macOS,variant=Mac Catalyst", + "watchos" => "generic/platform=watchOS", + "watchsimulator" => "generic/platform=watchOS Simulator", + ); + my $destination = $destinations{$xcodeSDKPlatformName} or die "No known destination for $xcodeSDKPlatformName"; + return $destination; +} + sub determineXcodeSDKPlatformName { return if defined $xcodeSDKPlatformName; my $sdk; # The user explicitly specified the sdk, don't assume anything - if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk)) { + if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk) || checkForArgumentAndRemoveFromARGVGettingValue("SDKROOT", \$sdk)) { $xcodeSDK = lc $sdk; $xcodeSDKPlatformName = $sdk; $xcodeSDKPlatformName =~ s/\.internal$//; @@ -1030,6 +1046,7 @@ sub XcodeOptions push @options, "-UseSanitizedBuildSystemEnvironment=YES"; push @options, "-ShowBuildOperationDuration=YES"; push @options, ("-configuration", $configuration); + push @options, ("-destination", genericDestinationForXcodeSDKPlatformName($xcodeSDKPlatformName)) if $xcodeSDKPlatformName; if ($asanIsEnabled) { my $xcconfig = $ubsanIsEnabled ? "asan+ubsan.xcconfig" : "asan.xcconfig"; push @options, ("-xcconfig", File::Spec->catfile(sourceDir(), "Tools", "sanitizer", $xcconfig)); @@ -1076,7 +1093,11 @@ sub XcodeOptions sub XcodeOptionString { - return join " ", XcodeOptions(); + my @options = XcodeOptions; + for (@options) { + s/ /\\ /g; + } + return join " ", @options; } sub XcodeOptionStringNoConfig diff --git a/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig b/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig index edbfeb3bc9ae..27b557edb2c4 100644 --- a/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig +++ b/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig @@ -29,3 +29,7 @@ FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=embedded*] = -lobjc -framework UIKit; FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework JavaScriptCore -framework WebKit -framework CoreGraphics -framework Cocoa; OTHER_LDFLAGS = $(inherited) $(FRAMEWORK_AND_LIBRARY_LDFLAGS); + +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; diff --git a/Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig b/Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig index c40bf8197bc1..d77716cb7c09 100644 --- a/Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig +++ b/Tools/TestWebKitAPI/Configurations/TestWTFLibrary.xcconfig @@ -27,5 +27,9 @@ PRODUCT_NAME = TestWTF; SKIP_INSTALL = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES; +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; + EXCLUDED_SOURCE_FILE_NAMES = $(inherited) $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM)); EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libgtest.a WebKit.framework; diff --git a/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig b/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig index 8324da2ead87..78409c40bb56 100644 --- a/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig +++ b/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig @@ -29,6 +29,10 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GTEST_API_= +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; + WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK)); WK_PRIVATE_FRAMEWORKS_DIR_[sdk=macos*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(TARGET_MAC_OS_X_VERSION_MAJOR); WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR); diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj index 4a1ed8f7c0e3..686c38f05723 100644 --- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj +++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj @@ -983,6 +983,7 @@ CEBCA13B1E3A807A00C73293 /* page-without-csp-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEBCA1361E3A803400C73293 /* page-without-csp-iframe.html */; }; CEDA12412437C9FB00C28A9E /* editable-region-composited-and-non-composited-overlap.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEDA12402437C9EA00C28A9E /* editable-region-composited-and-non-composited-overlap.html */; }; DD0EDF8D2798A6AD005152AD /* libgtest.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = F3FC3EE213678B7300126A65 /* libgtest.a */; }; + DD42949F284BE0B7004D49ED /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = C081224813FC1B0300DC39AE /* WebKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DDD2187627A21750002B7025 /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = C081224813FC1B0300DC39AE /* WebKit.framework */; }; DF1C7CE927F5161D00D8145C /* BundlePageConsoleMessageWithDetails.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF1C7CE827F5161D00D8145C /* BundlePageConsoleMessageWithDetails.mm */; }; DF1C7CEC27F5309700D8145C /* console-message-with-details.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = DF1C7CEB27F5305A00D8145C /* console-message-with-details.html */; }; @@ -1713,6 +1714,17 @@ name = "Product Dependencies"; runOnlyForDeploymentPostprocessing = 0; }; + DD42949E284BE0A6004D49ED /* Product Dependencies */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + DD42949F284BE0B7004D49ED /* WebKit.framework in Product Dependencies */, + ); + name = "Product Dependencies"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -5313,6 +5325,7 @@ isa = PBXNativeTarget; buildConfigurationList = BC575986126E74AF006F0F12 /* Build configuration list for PBXNativeTarget "InjectedBundleTestWebKitAPI" */; buildPhases = ( + DD42949E284BE0A6004D49ED /* Product Dependencies */, BC57597C126E74AF006F0F12 /* Resources */, BC57597D126E74AF006F0F12 /* Sources */, BC57597E126E74AF006F0F12 /* Frameworks */, diff --git a/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig b/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig index 3d2c3d0c739a..50dc027db213 100644 --- a/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig +++ b/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig @@ -37,6 +37,10 @@ OTHER_LDFLAGS_ = -framework Carbon -framework Cocoa -lAccessibility; STRIP_STYLE = debugging; +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; + EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH)); EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = AccessibilityControllerMac.mm AccessibilityTextMarkerMac.mm AccessibilityUIElementMac.mm ActivateFonts.mm InjectedBundleMac.mm InjectedBundlePageMac.mm; EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.*; diff --git a/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig b/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig index 530c6edb4f21..404e5fca30ed 100644 --- a/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig +++ b/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig @@ -34,6 +34,10 @@ OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -lWebKitTestRunner -framework Carbon - STRIP_STYLE = debugging; SKIP_INSTALL[sdk=embedded*] = YES; +// Workaround for "WebKit is not available..." error (rdar://91668054) +DISABLE_SDK_METADATA_PARSING[sdk=appletv*] = YES; +DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES; + EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH)); EXCLUDED_SOURCE_FILE_NAMES_ = ; EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = mac/*; diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme index 995808a92550..994c57ec3913 100644 --- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme +++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme @@ -182,9 +182,9 @@ buildForAnalyzing = "YES"> diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme index 6979e12a6138..f54248c0924a 100644 --- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme +++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme @@ -28,9 +28,9 @@ buildForAnalyzing = "YES">