Changeset 58367 in webkit


Ignore:
Timestamp:
Apr 27, 2010 6:28:34 PM (14 years ago)
Author:
weinig@apple.com
Message:

Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
Allow both WebKit and WebKit2 to link to the same WebCore.framework

Reviewed by Maciej Stachowiak.

WebCore:

  • Configurations/WebCore.xcconfig: Use -allowable_client WebKit2 to add

WebKit2 to the list of frameworks that can link directly to WebCore. It
is not necessary for it to be an umbrella since we don't need to reexport
any symbols.

WebKit2:

  • Configurations/WebKit2.xcconfig: Remove the OTHER_LDFLAGS. We don't

need to set WebCore as a sub_umbrella of WebKit2, since we are not
reexporting any of its symbols.

WebKitTools:

  • Scripts/build-webkit: Remove the UMBRELLA_LDFLAGS override when building

WebCore for WebKit2, it is no longer necessary.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r58366 r58367  
     12010-04-27  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
     6        Allow both WebKit and WebKit2 to link to the same WebCore.framework
     7
     8        * Configurations/WebCore.xcconfig: Use -allowable_client WebKit2 to add
     9        WebKit2 to the list of frameworks that can link directly to WebCore. It
     10        is not necessary for it to be an umbrella since we don't need to reexport
     11        any symbols.
     12
    1132010-04-27  Dumitru Daniliuc  <dumi@chromium.org>
    214
  • trunk/WebCore/Configurations/WebCore.xcconfig

    r55867 r58367  
    4040INSTALLHDRS_SCRIPT_PHASE = YES;
    4141PRODUCT_NAME = WebCore;
    42 UMBRELLA_LDFLAGS = -umbrella WebKit;
     42UMBRELLA_LDFLAGS = -umbrella WebKit -allowable_client WebKit2;
    4343VISIBILITY_LDFLAGS = ;
    4444OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc $(UMBRELLA_LDFLAGS) $(VISIBILITY_LDFLAGS);
  • trunk/WebKit2/ChangeLog

    r58332 r58367  
     12010-04-27  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
     6        Allow both WebKit and WebKit2 to link to the same WebCore.framework
     7
     8        * Configurations/WebKit2.xcconfig: Remove the OTHER_LDFLAGS. We don't
     9        need to set WebCore as a sub_umbrella of WebKit2, since we are not
     10        reexporting any of its symbols.
     11
    1122010-04-27  Sam Weinig  <sam@webkit.org>
    213
  • trunk/WebKit2/Configurations/WebKit2.xcconfig

    r57389 r58367  
    2727INFOPLIST_FILE = Info.plist;
    2828INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    29 OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS);
    3029
    3130// FIXME: We need to add an exports file to limit the set of exported symbols.
  • trunk/WebKitTools/ChangeLog

    r58364 r58367  
     12010-04-27  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
     6        Allow both WebKit and WebKit2 to link to the same WebCore.framework
     7
     8        * Scripts/build-webkit: Remove the UMBRELLA_LDFLAGS override when building
     9        WebCore for WebKit2, it is no longer necessary.
     10
    1112010-04-27  James Robinson  <jamesr@chromium.org>
    212
  • trunk/WebKitTools/Scripts/build-webkit

    r58324 r58367  
    395395        $result = buildQMakeQtProject($dir, $clean, @options);
    396396    } elsif (isAppleMacWebKit()) {
    397         my @completeOptions = @options;
    398         if ($webkit2 && $dir eq "WebCore") {
    399             my @webKit2SpecificOverrides = (
    400                 'UMBRELLA_LDFLAGS='
    401             );
    402             push @completeOptions, @webKit2SpecificOverrides;
    403         }
    404 
    405         $result = buildXCodeProject($dir, $clean, @completeOptions, @ARGV);
     397        $result = buildXCodeProject($dir, $clean, @options, @ARGV);
    406398    } elsif (isAppleWinWebKit()) {
    407399        if ($dir eq "WebKit") {
Note: See TracChangeset for help on using the changeset viewer.