Changeset 194018 in webkit


Ignore:
Timestamp:
Dec 13, 2015 3:21:35 PM (8 years ago)
Author:
mitz@apple.com
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.
Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r194006 r194018  
     12015-12-13  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Shims aren’t inserted properly on Yosemite when building with the El Capitan SDK
     4        https://bugs.webkit.org/show_bug.cgi?id=152229
     5
     6        Reviewed by Darin Adler.
     7
     8        * Configurations/BaseTarget.xcconfig: Defined WK_LINK_SHIM on OS X to YES or NO based on the
     9          target version.
     10        * Configurations/BaseXPCService.xcconfig: Define WK_XPC_SERVICE_INFOPLIST_SUFFIX to
     11          "-10.9-10.10" when targeting those OS X versions.
     12        * Configurations/NetworkService.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
     13          definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
     14        * Configurations/PluginProcess.xcconfig: Use WK_LINK_SHIM in the definition of
     15          LDFLAGS_SHIM_Production for OS X.
     16        * Configurations/PluginService.32.xcconfig: Use WK_XPC_SERVICE_INFOPLIST_SUFFIX in the
     17          definition of INFOPLIST_FILE. Use WK_LINK_SHIM in the definition of OTHER_LDFLAGS.
     18        * Configurations/PluginService.64.xcconfig: Ditto.
     19        * Configurations/WebContentService.xcconfig: Ditto.
     20
    1212015-12-12  Katlyn Graff  <kgraff@apple.com>
    222

  • trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig

    r185298 r194018  
    6464WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
    6565WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
     66
     67WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     68WK_DONT_LINK_SHIM_1090 = YES;
     69WK_DONT_LINK_SHIM_1010 = YES;
     70
     71WK_LINK_SHIM[sdk=macosx*] = $(WK_LINK_SHIM_$(WK_DONT_LINK_SHIM));
     72WK_LINK_SHIM_ = $(WK_LINK_SHIM_NO);
     73WK_LINK_SHIM_NO = YES;
     74WK_LINK_SHIM_YES = NO;

  • trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig

    r193378 r194018  
    5555CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_NO = Configurations/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE).entitlements;
    5656CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_YES = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/$(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE)-no-sandbox.entitlements;
     57
     58WK_XPC_SERVICE_INFOPLIST_SUFFIX[sdk=macosx*] = $(WK_XPC_SERVICE_INFOPLIST_SUFFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     59WK_XPC_SERVICE_INFOPLIST_SUFFIX_1090 = -10.9-10.10;
     60WK_XPC_SERVICE_INFOPLIST_SUFFIX_1010 = -10.9-10.10;

  • trunk/Source/WebKit2/Configurations/NetworkService.xcconfig

    r185298 r194018  
    2929PRODUCT_NAME = com.apple.WebKit.Networking;
    3030INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
    31 INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
    32 INFOPLIST_FILE[sdk=macosx10.9*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
    33 INFOPLIST_FILE[sdk=macosx10.10*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
     31INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
    3432
    35 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
    36 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
    37 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = ;
    38 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = ;
     33OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
     34OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;

  • trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig

    r186770 r194018  
    3030OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(LDFLAGS_SHIM_$(CONFIGURATION));
    3131
    32 LDFLAGS_SHIM_Production[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    33 LDFLAGS_SHIM_Production[sdk=macosx10.9*] = ;
    34 LDFLAGS_SHIM_Production[sdk=macosx10.10*] = ;
     32LDFLAGS_SHIM_Production[sdk=macosx*] = LDFLAGS_SHIM_$(WK_LINK_SHIM);
     33LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    3534
    3635EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;

  • trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig

    r185814 r194018  
    3131
    3232PRODUCT_NAME = com.apple.WebKit.Plugin.32;
    33 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
    34 INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    35 INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
     33INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
    3634
    3735OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
    38 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    39 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
    40 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
     36OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
     37OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    4138
    4239CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;

  • trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig

    r185814 r194018  
    3131
    3232PRODUCT_NAME = com.apple.WebKit.Plugin.64;
    33 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
    34 INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    35 INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
     33INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
    3634
    3735OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
    38 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    39 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
    40 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
     36OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
     37OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
    4138
    4239CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;

  • trunk/Source/WebKit2/Configurations/WebContentService.xcconfig

    r185298 r194018  
    2929PRODUCT_NAME = com.apple.WebKit.WebContent;
    3030INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
    31 INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
    32 INFOPLIST_FILE[sdk=macosx10.9*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
    33 INFOPLIST_FILE[sdk=macosx10.10*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
     31INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
    3432
    3533BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
    … …  
    4139
    4240OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
    43 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
    44 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
    45 OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
     41OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(OTHER_LDFLAGS_SHIM_$(WK_LINK_SHIM));
     42OTHER_LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
Note: See TracChangeset for help on using the changeset viewer.