Title: [194018] trunk/Source/WebKit2
- Revision
- 194018
- Author
- [email protected]
- Date
- 2015-12-13 15:21:35 -0800 (Sun, 13 Dec 2015)
Log Message
[Mac] Shims aren’t inserted properly on Yosemite when building with the El Capitan SDK
https://bugs.webkit.org/show_bug.cgi?id=152229
Reviewed by Darin Adler.
* Configurations/BaseTarget.xcconfig: Defined WK_LINK_SHIM on OS X to YES or NO based on the
target version.
* Configurations/BaseXPCService.xcconfig: Define WK_XPC_SERVICE_INFOPLIST_SUFFIX to
"-10.9-10.10" when targeting those OS X versions.
* Configurations/NetworkService.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
* Configurations/PluginProcess.xcconfig: Use WK_LINK_SHIM in the definition of
LDFLAGS_SHIM_Production for OS X.
* Configurations/PluginService.32.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
* Configurations/PluginService.64.xcconfig: Ditto.
* Configurations/WebContentService.xcconfig: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (194017 => 194018)
--- trunk/Source/WebKit2/ChangeLog 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-13 23:21:35 UTC (rev 194018)
@@ -1,3 +1,23 @@
+2015-12-13 Dan Bernstein <[email protected]>
+
+ [Mac] Shims aren’t inserted properly on Yosemite when building with the El Capitan SDK
+ https://bugs.webkit.org/show_bug.cgi?id=152229
+
+ Reviewed by Darin Adler.
+
+ * Configurations/BaseTarget.xcconfig: Defined WK_LINK_SHIM on OS X to YES or NO based on the
+ target version.
+ * Configurations/BaseXPCService.xcconfig: Define WK_XPC_SERVICE_INFOPLIST_SUFFIX to
+ "-10.9-10.10" when targeting those OS X versions.
+ * Configurations/NetworkService.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
+ definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
+ * Configurations/PluginProcess.xcconfig: Use WK_LINK_SHIM in the definition of
+ LDFLAGS_SHIM_Production for OS X.
+ * Configurations/PluginService.32.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
+ definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+
2015-12-12 Katlyn Graff <[email protected]>
Safari background tabs should be fully suspended where possible.
Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -63,3 +63,12 @@
WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
+
+WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_DONT_LINK_SHIM_1090 = YES;
+WK_DONT_LINK_SHIM_1010 = YES;
+
+WK_LINK_SHIM[sdk=macosx*] = $(WK_LINK_SHIM_$(WK_DONT_LINK_SHIM));
+WK_LINK_SHIM_ = $(WK_LINK_SHIM_NO);
+WK_LINK_SHIM_NO = YES;
+WK_LINK_SHIM_YES = NO;
Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -54,3 +54,7 @@
CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_ = $(CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_NO);
CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_NO = Configurations/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE).entitlements;
CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_YES = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE)-no-sandbox.entitlements;
+
+WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_XPC_SERVICE_INFOPLIST_SUFFIX_1090 = -10.9-10.10;
+WK_XPC_SERVICE_INFOPLIST_SUFFIX_1010 = -10.9-10.10;
Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -28,11 +28,7 @@
PRODUCT_NAME = com.apple.WebKit.Networking;
INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = ;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = ;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
Modified: trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -29,9 +29,8 @@
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(LDFLAGS_SHIM_$(CONFIGURATION));
-LDFLAGS_SHIM_Production[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-LDFLAGS_SHIM_Production[sdk=macosx10.9*] = ;
-LDFLAGS_SHIM_Production[sdk=macosx10.10*] = ;
+LDFLAGS_SHIM_Production[sdk=macosx*] = LDFLAGS_SHIM_$(WK_LINK_SHIM);
+LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -30,14 +30,11 @@
VALID_ARCHS_macosx_NO = i386;
PRODUCT_NAME = com.apple.WebKit.Plugin.32;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -30,14 +30,11 @@
VALID_ARCHS_macosx_NO = x86_64;
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (194017 => 194018)
--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-12-13 20:03:24 UTC (rev 194017)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2015-12-13 23:21:35 UTC (rev 194018)
@@ -28,9 +28,7 @@
PRODUCT_NAME = com.apple.WebKit.WebContent;
INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
-INFOPLIST_FILE[sdk=macosx10.9*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
-INFOPLIST_FILE[sdk=macosx10.10*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
@@ -40,6 +38,5 @@
BUNDLE_LOCALIZATION_KEY_macosx_101200 = CFBundleFollowParentLocalization;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
+OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
