Changeset 152267 in webkit


Ignore:
Timestamp:
Jul 1, 2013 3:23:11 PM (11 years ago)
Author:
timothy@apple.com
Message:

Link to WebInspectorUI.framework at build time instead of soft linking.

​https://bugs.webkit.org/show_bug.cgi?id=118261

Reviewed by Joseph Pecoraro.

.:

  • Source/Makefile: Build WebInspectorUI before WebKit and WebKit2.

Source/WebKit:

  • WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

  • Configurations/WebKit.xcconfig:
  • WebCoreSupport/WebInspectorClient.mm:

(useWebKitWebInspector):

Source/WebKit2:

  • Configurations/WebKit2.xcconfig:
  • UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::inspectorReallyUsesWebKitUserInterface):

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/mac/WebInspectorMac.mm:

(WebKit::inspectorReallyUsesWebKitUserInterface):

Tools:

  • Scripts/build-webkit: Build WebInspectorUI before WebKit and WebKit2.
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r152163 r152267  
     12013-07-01  Timothy Hatcher  <timothy@apple.com>
     2
     3        Link to WebInspectorUI.framework at build time instead of soft linking.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=118261
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * Source/Makefile: Build WebInspectorUI before WebKit and WebKit2.
     10
    1112013-06-28  Sean Bright  <sean@malleable.com>
    212

  • trunk/Source/Makefile

    r151455 r152267  
    1 MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2 WebInspectorUI
     1MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
    22
    33ifneq (,$(findstring iphoneos,$(SDKROOT)))

  • trunk/Source/WebKit/ChangeLog

    r152239 r152267  
     12013-07-01  Timothy Hatcher  <timothy@apple.com>
     2
     3        Link to WebInspectorUI.framework at build time instead of soft linking.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=118261
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * WebKit.xcodeproj/project.pbxproj:
     10
    1112013-07-01  Brent Fulgham  <bfulgham@apple.com>
    212

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

    r151888 r152267  
    449449                1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    450450                1C9F5EFB1651CDF700C480F8 /* Dock.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Dock.pdf; sourceTree = "<group>"; };
     451                1CC915AB1782151B002CC4B1 /* WebInspectorUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebInspectorUI.framework; path = "/Users/Timothy/Work/Safari-TOT.git/OpenSource/WebKitBuild/Release/WebInspectorUI.framework"; sourceTree = "<absolute>"; };
    451452                1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OldWebAssertions.c; sourceTree = "<group>"; };
    452453                224100F2091818D900D2D266 /* WebPluginsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    832833                                830E81E005853AC000AD0891 /* Security.framework */,
    833834                                F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */,
     835                                1CC915AB1782151B002CC4B1 /* WebInspectorUI.framework */,
    834836                        );
    835837                        name = "Frameworks and Libraries";

  • trunk/Source/WebKit/mac/ChangeLog

    r152238 r152267  
     12013-07-01  Timothy Hatcher  <timothy@apple.com>
     2
     3        Link to WebInspectorUI.framework at build time instead of soft linking.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=118261
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * Configurations/WebKit.xcconfig:
     10        * WebCoreSupport/WebInspectorClient.mm:
     11        (useWebKitWebInspector):
     12
    1132013-07-01  Jochen Eisinger  <jochen@chromium.org>
    214

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

    r149713 r152267  
    7171OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO;
    7272OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    73 OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security;
     73OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security -framework WebInspectorUI;
    7474
    7575NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));

  • trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

    r151454 r152267  
    5050#import <WebCore/ScriptController.h>
    5151#import <WebCore/ScriptValue.h>
    52 #import <WebCore/SoftLinking.h>
    5352#import <WebKit/DOMExtensions.h>
    5453#import <WebKitSystemInterface.h>
    5554#import <wtf/PassOwnPtr.h>
    56 
    57 SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
    5855
    5956// The margin from the top and right of the dock button (same as the full screen button).
    … …  
    221218static bool useWebKitWebInspector()
    222219{
    223     // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
    224     WebInspectorUILibrary();
    225 
    226220    if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
    227221        return true;

  • trunk/Source/WebKit2/ChangeLog

    r152266 r152267  
     12013-07-01  Timothy Hatcher  <timothy@apple.com>
     2
     3        Link to WebInspectorUI.framework at build time instead of soft linking.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=118261
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * Configurations/WebKit2.xcconfig:
     10        * UIProcess/mac/WebInspectorProxyMac.mm:
     11        (WebKit::inspectorReallyUsesWebKitUserInterface):
     12        * WebKit2.xcodeproj/project.pbxproj:
     13        * WebProcess/WebPage/mac/WebInspectorMac.mm:
     14        (WebKit::inspectorReallyUsesWebKitUserInterface):
     15
    1162013-07-01  Tim Horton  <timothy_horton@apple.com>
    217

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

    r139500 r152267  
    3333
    3434OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS);
    35 OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
     35OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebInspectorUI;
    3636
    3737EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));

  • trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

    r151454 r152267  
    4848#import <WebCore/InspectorFrontendClientLocal.h>
    4949#import <WebCore/LocalizedStrings.h>
    50 #import <WebCore/SoftLinking.h>
    5150#import <wtf/text/WTFString.h>
    52 
    53 SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
    5451
    5552using namespace WebCore;
    … …  
    194191{
    195192    // This matches a similar check in WebInspectorMac.mm. Keep them in sync.
    196 
    197     // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
    198     WebInspectorUILibrary();
    199193
    200194    if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])

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

    r151888 r152267  
    17551755                1CBC945D16515ED200D68AAE /* DockBottom.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = DockBottom.pdf; path = Resources/DockBottom.pdf; sourceTree = "<group>"; };
    17561756                1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerCompletion.h; sourceTree = "<group>"; };
     1757                1CC915A91782106D002CC4B1 /* WebInspectorUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebInspectorUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    17571758                290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
    17581759                293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
    … …  
    30063007                                BCF5068412431861005955AE /* Security.framework */,
    30073008                                1AA1C79A100E7FC50078DEBC /* WebCore.framework */,
     3009                                1CC915A91782106D002CC4B1 /* WebInspectorUI.framework */,
    30083010                        );
    30093011                        name = "Linked Frameworks";

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm

    r151454 r152267  
    2727#import "WebInspector.h"
    2828
    29 #import <WebCore/SoftLinking.h>
    30 
    31 SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
    32 
    3329namespace WebKit {
    3430
    … …  
    3632{
    3733    // This matches a similar check in WebInspectorProxyMac.mm. Keep them in sync.
    38 
    39     // Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
    40     WebInspectorUILibrary();
    4134
    4235    if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])

  • trunk/Tools/ChangeLog

    r152265 r152267  
     12013-07-01  Timothy Hatcher  <timothy@apple.com>
     2
     3        Link to WebInspectorUI.framework at build time instead of soft linking.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=118261
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * Scripts/build-webkit: Build WebInspectorUI before WebKit and WebKit2.
     10
    1112013-07-01  Tim Horton  <timothy_horton@apple.com>
    212

  • trunk/Tools/Scripts/build-webkit

    r151523 r152267  
    228228    push @projects, ("Source/WebKit2", "Tools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
    229229
    230     push @projects, ("Source/WebInspectorUI");
     230    # WebInspectorUI must come before WebKit and WebKit2
     231    unshift @projects, ("Source/WebInspectorUI");
    231232
    232233    # Build Tools needed for Apple ports
Note: See TracChangeset for help on using the changeset viewer.