Changeset 222897 in webkit


Ignore:
Timestamp:
Oct 4, 2017 10:46:49 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Stop linking with WebKitSystemInterface
​https://bugs.webkit.org/show_bug.cgi?id=177915

Reviewed by Antti Koivisto.

Source/WebKit:

  • Configurations/DebugRelease.xcconfig:
  • WebKit.xcodeproj/project.pbxproj:

Source/WebKitLegacy:

  • WebKitLegacy.xcodeproj/project.pbxproj:

Source/WebKitLegacy/mac:

  • Configurations/DebugRelease.xcconfig:
  • Configurations/WebKitLegacy.xcconfig:

Tools:

  • DumpRenderTree/mac/Configurations/Base.xcconfig:
  • DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
  • DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
  • DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
  • WebKitTestRunner/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/DebugRelease.xcconfig:
  • WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
  • WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
  • WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig:
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r222896 r222897  
     12017-10-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop linking with WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=177915
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9        * WebKit.xcodeproj/project.pbxproj:
     10
    1112017-10-04  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebKit/Configurations/DebugRelease.xcconfig

    r219082 r222897  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    43 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    44 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    45 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
    46 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
    47 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
    48 
    4941SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    5042SDKROOT_ = macosx;

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r222896 r222897  
    1103511035                                OTHER_LDFLAGS = (
    1103611036                                        "$(OTHER_LDFLAGS)",
    11037                                         "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
    1103811037                                );
    1103911038                                PRODUCT_NAME = PluginProcessShim;
    … …  
    1104711046                                OTHER_LDFLAGS = (
    1104811047                                        "$(OTHER_LDFLAGS)",
    11049                                         "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
    1105011048                                );
    1105111049                                PRODUCT_NAME = PluginProcessShim;
    … …  
    1105911057                                OTHER_LDFLAGS = (
    1106011058                                        "$(OTHER_LDFLAGS)",
    11061                                         "-lWebKitSystemInterface",
    1106211059                                );
    1106311060                                PRODUCT_NAME = PluginProcessShim;
    … …  
    1107111068                                OTHER_LDFLAGS = (
    1107211069                                        "$(OTHER_LDFLAGS)",
    11073                                         "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
    1107411070                                );
    1107511071                        };
    … …  
    1108211078                                OTHER_LDFLAGS = (
    1108311079                                        "$(OTHER_LDFLAGS)",
    11084                                         "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
    1108511080                                );
    1108611081                        };
    … …  
    1116911164                                OTHER_LDFLAGS = (
    1117011165                                        "$(OTHER_LDFLAGS)",
    11171                                         "-lWebKitSystemInterface",
    1117211166                                );
    1117311167                        };

  • trunk/Source/WebKitLegacy/ChangeLog

    r222747 r222897  
     12017-10-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop linking with WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=177915
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * WebKitLegacy.xcodeproj/project.pbxproj:
     9
    1102017-10-02  Per Arne Vollan  <pvollan@apple.com>
    211

  • trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj

    r222896 r222897  
    37123712                                OTHER_LDFLAGS = (
    37133713                                        "$(OTHER_LDFLAGS)",
    3714                                         "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
    37153714                                );
    37163715                        };
    … …  
    37243723                                OTHER_LDFLAGS = (
    37253724                                        "$(OTHER_LDFLAGS)",
    3726                                         "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
    37273725                                );
    37283726                        };
    … …  
    37363734                                OTHER_LDFLAGS = (
    37373735                                        "$(OTHER_LDFLAGS)",
    3738                                         "-lWebKitSystemInterface",
    37393736                                );
    37403737                        };

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r222896 r222897  
     12017-10-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop linking with WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=177915
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9        * Configurations/WebKitLegacy.xcconfig:
     10
    1112017-10-04  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig

    r219082 r222897  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    43 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    44 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    45 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
    46 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
    47 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
    48 
    4941SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    5042SDKROOT_ = macosx;

  • trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

    r219695 r222897  
    5353
    5454WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
    55 HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
     55HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
    5656INFOPLIST_FILE = mac/Info.plist;
    5757INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    … …  
    101101WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
    102102
    103 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
    104 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    105 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    106 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
    107 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT)/usr/local/include;
    108 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include;
    109 
    110103WK_EMPTY_ = YES;
    111104WK_NOT_ = YES;

  • trunk/Tools/ChangeLog

    r222896 r222897  
     12017-10-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop linking with WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=177915
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     9        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
     10        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
     11        * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
     12        * WebKitTestRunner/Configurations/Base.xcconfig:
     13        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
     14        * WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
     15        * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
     16        * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig:
     17
    1182017-10-04  Alex Christensen  <achristensen@webkit.org>
    219

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r222293 r222897  
    103103WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
    104104
    105 WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
    106 
    107105AD_HOC_CODE_SIGNING_ALLOWED = YES;
    108106

  • trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

    r219082 r222897  
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
    3737
    38 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
    39 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    40 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    41 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
    43 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
    44 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
    45 
    4638SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    4739SDKROOT_ = macosx;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig

    r194115 r222897  
    2626OTHER_LDFLAGS = $(inherited) $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
    2727PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -framework JavaScriptCore;
    28 PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework QuartzCore -framework WebKit;
     28PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework QuartzCore -framework WebKit;
    2929LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
    3030PRODUCT_NAME = DumpRenderTree;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig

    r209288 r222897  
    2929
    3030OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
    31 PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
     31PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
    3232PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -framework JavaScriptCore;
    3333

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r222293 r222897  
    9393FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
    9494
    95 WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
    96 
    9795OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
    9896OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

  • trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

    r219082 r222897  
    3636MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    3737
    38 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
    39 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
    40 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    41 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
    42 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
    43 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
    44 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
    45 
    4638SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    4739SDKROOT_ = macosx;

  • trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig

    r210143 r222897  
    3131SKIP_INSTALL = NO;
    3232
    33 OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework CoreText -framework QuartzCore;
     33OTHER_LDFLAGS_BASE = -framework CoreText -framework QuartzCore;
    3434OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_PLATFORM);
    3535OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;

  • trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig

    r204853 r222897  
    3030PRODUCT_NAME = WebKitTestRunner;
    3131GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    32 OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;
     32OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;
    3333SKIP_INSTALL[sdk=iphone*] = YES;
    3434EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/*;

  • trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig

    r209288 r222897  
    3131GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    3232
    33 OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -lWebCoreTestSupport -framework JavaScriptCore -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
     33OTHER_LDFLAGS = $(inherited) -lWebKitTestRunner -lWebCoreTestSupport -framework JavaScriptCore -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
    3434
    3535SKIP_INSTALL[sdk=macosx*] = YES;
Note: See TracChangeset for help on using the changeset viewer.