Changeset 164576 in webkit


Ignore:
Timestamp:
Feb 23, 2014 9:29:33 PM (10 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/16144508> [iOS] Some definitions of INSTALL_PATH don’t account for INSTALL_PATH_PREFIX
​https://bugs.webkit.org/show_bug.cgi?id=129241

Reviewed by Mark Rowe.

  • Configurations/Base.xcconfig: Define INSTALL_PATH here in terms of INSTALL_PATH_ACTUAL.
  • Configurations/BaseLegacyProcess.xcconfig: Define only INSTALL_PATH_ACTUAL.
  • Configurations/BaseTarget.xcconfig: Simplify the definition of

NORMAL_WEBKIT2_FRAMEWORKS_DIR, now that it shouldn’t include SDKROOT for the Simulator.

  • Configurations/BaseXPCService.xcconfig: Define only INSTALL_PATH_ACTUAL.
  • Configurations/WebKit2.xcconfig: Ditto.
Location:
trunk/Source/WebKit2
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r164573 r164576  
     12014-02-23  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/16144508> [iOS] Some definitions of INSTALL_PATH don’t account for INSTALL_PATH_PREFIX
     4        https://bugs.webkit.org/show_bug.cgi?id=129241
     5
     6        Reviewed by Mark Rowe.
     7
     8        * Configurations/Base.xcconfig: Define INSTALL_PATH here in terms of INSTALL_PATH_ACTUAL.
     9        * Configurations/BaseLegacyProcess.xcconfig: Define only INSTALL_PATH_ACTUAL.
     10        * Configurations/BaseTarget.xcconfig: Simplify the definition of
     11        NORMAL_WEBKIT2_FRAMEWORKS_DIR, now that it shouldn’t include SDKROOT for the Simulator.
     12        * Configurations/BaseXPCService.xcconfig: Define only INSTALL_PATH_ACTUAL.
     13        * Configurations/WebKit2.xcconfig: Ditto.
     14
    1152014-02-23  Sam Weinig  <sam@webkit.org>
    216

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

    r162909 r164576  
    9595SECTORDER_FLAGS = -Wl,-order_file,mac/WebKit2.order;
    9696
     97INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
     98
    9799SDKROOT = macosx.internal;
    98100

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

    r162104 r164576  
    2525
    2626GCC_ENABLE_OBJC_GC = NO;
    27 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    28 INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebKit2.framework;
    29 INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
    30 INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
    31 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    32 INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
     27INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
    3328
    3429APP_ICON = $(APP_ICON_$(CONFIGURATION));

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

    r161829 r164576  
    3333OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    3434
    35 NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    36 NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    37 NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    38 NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     35NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    3936
    4037WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));

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

    r164547 r164576  
    2626GCC_ENABLE_OBJC_GC = NO;
    2727
    28 INSTALL_PATH = $(INSTALL_PATH_$(WK_XPC_SERVICE_VARIANT));
     28INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
    2929
    30 INSTALL_PATH_Normal = $(INSTALL_PATH_Normal_$(PLATFORM_NAME));
    31 INSTALL_PATH_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
    32 INSTALL_PATH_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
     30INSTALL_PATH_ACTUAL_Normal = $(INSTALL_PATH_ACTUAL_Normal_$(PLATFORM_NAME));
     31INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
     32INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
    3333
    34 INSTALL_PATH_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
     34INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
    3535
    3636APP_ICON = $(APP_ICON_$(CONFIGURATION));
    … …  
    4545MACH_O_TYPE = mh_execute;
    4646
    47 
    4847OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);

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

    r164342 r164576  
    2727INFOPLIST_FILE = Info.plist;
    2828
    29 INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR);
    30 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    31 INSTALL_PATH_ACTUAL_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
     29INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR);
    3230DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
    3331
Note: See TracChangeset for help on using the changeset viewer.