Title: [262801] trunk/Source/WebKit
- Revision
- 262801
- Author
- [email protected]
- Date
- 2020-06-09 11:53:29 -0700 (Tue, 09 Jun 2020)
Log Message
WebKit: Support watchOS and tvOS in xcconfigs
https://bugs.webkit.org/show_bug.cgi?id=212977
<rdar://problem/64170532>
Reviewed by Tim Horton.
No new tests, behavior unchanged.
* Configurations/Base.xcconfig: Add tvOS and watchOS major version macros.
* Configurations/BaseTarget.xcconfig: Include tvOS and watchOS framework stubs.
* Configurations/BaseXPCService.xcconfig: Generalize excluded files for all embedded platforms.
* Configurations/GPUService.xcconfig: Generalize INFOPLIST for embedded platforms.
* Configurations/NetworkService.xcconfig: Ditto.
* Configurations/WebContentService.xcconfig: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262800 => 262801)
--- trunk/Source/WebKit/ChangeLog 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/ChangeLog 2020-06-09 18:53:29 UTC (rev 262801)
@@ -1,3 +1,20 @@
+2020-06-09 Jonathan Bedard <[email protected]>
+
+ WebKit: Support watchOS and tvOS in xcconfigs
+ https://bugs.webkit.org/show_bug.cgi?id=212977
+ <rdar://problem/64170532>
+
+ Reviewed by Tim Horton.
+
+ No new tests, behavior unchanged.
+
+ * Configurations/Base.xcconfig: Add tvOS and watchOS major version macros.
+ * Configurations/BaseTarget.xcconfig: Include tvOS and watchOS framework stubs.
+ * Configurations/BaseXPCService.xcconfig: Generalize excluded files for all embedded platforms.
+ * Configurations/GPUService.xcconfig: Generalize INFOPLIST for embedded platforms.
+ * Configurations/NetworkService.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+
2020-06-09 Alex Christensen <[email protected]>
Expose PDF file URL in shouldAllowPDFToOpenFromFrame SPI
Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (262800 => 262801)
--- trunk/Source/WebKit/Configurations/Base.xcconfig 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig 2020-06-09 18:53:29 UTC (rev 262801)
@@ -95,7 +95,9 @@
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); // iOS 9.3 => 9
+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);
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (262800 => 262801)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2020-06-09 18:53:29 UTC (rev 262801)
@@ -27,11 +27,12 @@
#include "WebKitTargetConditionals.xcconfig"
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);
-FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"
-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS = "$(UMBRELLA_FRAMEWORKS_DIR)" $(WK_PRIVATE_FRAMEWORKS_DIR);
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (262800 => 262801)
--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2020-06-09 18:53:29 UTC (rev 262801)
@@ -37,11 +37,10 @@
APP_ICON_Release = WebKit.icns;
APP_ICON_Production = ;
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
+EXCLUDED_SOURCE_FILE_NAMES[sdk=embedded*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib;
-
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
WK_RELOCATABLE_FRAMEWORKS_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
Modified: trunk/Source/WebKit/Configurations/GPUService.xcconfig (262800 => 262801)
--- trunk/Source/WebKit/Configurations/GPUService.xcconfig 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/Configurations/GPUService.xcconfig 2020-06-09 18:53:29 UTC (rev 262801)
@@ -25,7 +25,7 @@
PRODUCT_NAME = com.apple.WebKit.GPU;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE[sdk=iphone*] = GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=embedded*] = GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-OSX.plist;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
Modified: trunk/Source/WebKit/Configurations/NetworkService.xcconfig (262800 => 262801)
--- trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2020-06-09 18:53:29 UTC (rev 262801)
@@ -25,7 +25,7 @@
PRODUCT_NAME = com.apple.WebKit.Networking;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=embedded*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (262800 => 262801)
--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2020-06-09 18:46:20 UTC (rev 262800)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2020-06-09 18:53:29 UTC (rev 262801)
@@ -29,7 +29,7 @@
PRODUCT_NAME_Development = com.apple.WebKit.WebContent.Development;
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=embedded*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist;
WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
