Title: [262957] trunk/Tools
- Revision
- 262957
- Author
- [email protected]
- Date
- 2020-06-12 10:39:49 -0700 (Fri, 12 Jun 2020)
Log Message
TestWebKitAPI: Build for watchOS and tvOS
https://bugs.webkit.org/show_bug.cgi?id=213127
<rdar://problem/64297979>
Reviewed by Tim Horton.
* TestWebKitAPI/Configurations/Base.xcconfig: Link against framework stubs.
* TestWebKitAPI/Configurations/InjectedBundle.xcconfig: Apply iOS rules to all embedded sdks.
* TestWebKitAPI/Configurations/TestWTF.xcconfig: Ditto.
* TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Link against framework stubs.
* TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig: Apply iOS rules to all embedded sdks.
* TestWebKitAPI/config.h: WatchOS uses SSL.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (262956 => 262957)
--- trunk/Tools/ChangeLog 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/ChangeLog 2020-06-12 17:39:49 UTC (rev 262957)
@@ -1,3 +1,18 @@
+2020-06-12 Jonathan Bedard <[email protected]>
+
+ TestWebKitAPI: Build for watchOS and tvOS
+ https://bugs.webkit.org/show_bug.cgi?id=213127
+ <rdar://problem/64297979>
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Configurations/Base.xcconfig: Link against framework stubs.
+ * TestWebKitAPI/Configurations/InjectedBundle.xcconfig: Apply iOS rules to all embedded sdks.
+ * TestWebKitAPI/Configurations/TestWTF.xcconfig: Ditto.
+ * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Link against framework stubs.
+ * TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig: Apply iOS rules to all embedded sdks.
+ * TestWebKitAPI/config.h: WatchOS uses SSL.
+
2020-06-12 Commit Queue <[email protected]>
Unreviewed, reverting r262942.
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (262956 => 262957)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2020-06-12 17:39:49 UTC (rev 262957)
@@ -89,12 +89,12 @@
TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600;
TARGET_MAC_OS_X_VERSION_MAJOR_17 = 101700;
+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
+WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
+WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
+
SDKROOT = macosx.internal;
-// FIXME: Remove these settings once <rdar://problem/27459890> is fixed.
-CODE_SIGNING_ALLOWED[sdk=iphonesimulator*] = YES;
-AD_HOC_CODE_SIGNING_ALLOWED[sdk=iphonesimulator*] = YES;
-
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
@@ -114,4 +114,10 @@
WK_COCOA_TOUCH_appletvos = cocoatouch;
WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(inherited);
+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);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=appletv*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/appletvos/$(WK_TARGET_TVOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=watch*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/watchos/$(WK_TARGET_WATCHOS_VERSION_MAJOR);
+
+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(WK_PRIVATE_FRAMEWORKS_DIR) $(inherited);
Modified: trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig (262956 => 262957)
--- trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig 2020-06-12 17:39:49 UTC (rev 262957)
@@ -25,7 +25,7 @@
PRODUCT_NAME = InjectedBundleTestWebKitAPI;
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
-FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphone*] = -lobjc -framework UIKit;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=embedded*] = -lobjc -framework UIKit;
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework _javascript_Core -framework WebKit -framework CoreGraphics -framework Cocoa;
OTHER_LDFLAGS = $(inherited) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig (262956 => 262957)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig 2020-06-12 17:39:49 UTC (rev 262957)
@@ -35,7 +35,7 @@
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Cocoa -framework Carbon;
// FIXME: This should not be built on iOS. Instead we should create and use a TestWTF application.
-OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework CoreGraphics;
+OTHER_LDFLAGS_PLATFORM[sdk=embedded*] = -framework CoreGraphics;
STRIP_STYLE = debugging;
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (262956 => 262957)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2020-06-12 17:39:49 UTC (rev 262957)
@@ -28,7 +28,10 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=mac*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(MAC_OS_X_VERSION_MAJOR);
+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);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=appletv*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/appletvos/$(WK_TARGET_TVOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=watch*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/watchos/$(WK_TARGET_WATCHOS_VERSION_MAJOR);
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(USE_INTERNAL_SDK));
@@ -66,7 +69,7 @@
LD_RUNPATH_SEARCH_PATHS = "@loader_path";
-CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/TestWebKitAPI-iOS.entitlements;
+CODE_SIGN_ENTITLEMENTS[sdk=embedded*] = Configurations/TestWebKitAPI-iOS.entitlements;
CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = Configurations/TestWebKitAPI-macOS.entitlements;
STRIP_STYLE = debugging;
Modified: trunk/Tools/TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig (262956 => 262957)
--- trunk/Tools/TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig 2020-06-12 17:39:49 UTC (rev 262957)
@@ -32,4 +32,4 @@
WRAPPER_EXTENSION = wkbundle;
OTHER_LDFLAGS = $(inherited) -framework _javascript_Core -framework WebKit -lWebCoreTestSupport;
LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = "@loader_path/../../..";
-LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = "@loader_path/..";
+LD_RUNPATH_SEARCH_PATHS[sdk=embedded*] = "@loader_path/..";
Modified: trunk/Tools/TestWebKitAPI/config.h (262956 => 262957)
--- trunk/Tools/TestWebKitAPI/config.h 2020-06-12 17:29:30 UTC (rev 262956)
+++ trunk/Tools/TestWebKitAPI/config.h 2020-06-12 17:39:49 UTC (rev 262957)
@@ -108,7 +108,7 @@
#endif
// FIXME: Move this to PlatformHave.h.
-#if !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST)
+#if !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS)
#define HAVE_SSL 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes