Changeset 64421 in webkit


Ignore:
Timestamp:
Jul 31, 2010 11:36:53 AM (14 years ago)
Author:
ddkilzer@apple.com
Message:

<​http://webkit.org/b/43300> Simplify variables in *.xcconfig files after adding iOS support

Reviewed by Darin Adler.

WebCore:

  • Configurations/WebCore.xcconfig: Extracted

PRODUCTION_FRAMEWORKS_DIR variable.

WebKit/mac:

  • Configurations/WebKit.xcconfig: Extracted

PRODUCTION_FRAMEWORKS_DIR and PRODUCTION_ROOT variables.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r64420 r64421  
     12010-07-31  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/43300> Simplify variables in *.xcconfig files after adding iOS support
     4
     5        Reviewed by Darin Adler.
     6
     7        * Configurations/WebCore.xcconfig: Extracted
     8        PRODUCTION_FRAMEWORKS_DIR variable.
     9
    1102010-07-31  Nikolas Zimmermann  <nzimmermann@rim.com>
    211

  • trunk/WebCore/Configurations/WebCore.xcconfig

    r64390 r64421  
    3838FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(REAL_PLATFORM_NAME));
    3939FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    40 FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     40FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
    4141FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
    42 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     42FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
    4343FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    4444FRAMEWORK_SEARCH_PATHS_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
    … …  
    5757OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit $(WEBKIT2_LDFLAGS);
    5858
     59PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     60PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     61PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
     62PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
     63
    5964WEBKIT2_LDFLAGS = $(WEBKIT2_LDFLAGS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    6065WEBKIT2_LDFLAGS_1060 = -allowable_client WebKit2;
    6166WEBKIT2_LDFLAGS_1070 = $(WEBKIT2_LDFLAGS_1060);
    6267
    63 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_$(REAL_PLATFORM_NAME));
    64 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphoneos = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphoneos_$(CONFIGURATION));
    65 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphoneos_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
    66 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphoneos_Debug = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
    67 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphoneos_Production = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/JavaScriptCore.framework/PrivateHeaders;
    68 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphonesimulator = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_iphoneos_$(CONFIGURATION));
    69 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_macosx = $(JAVASCRIPTCORE_PRIVATE_HEADERS_macosx_$(CONFIGURATION));
    70 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_macosx_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
    71 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_macosx_Debug = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
    72 JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_macosx_Production = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
     68JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
     69JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
     70JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Debug = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
     71JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
    7372JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
    7473

  • trunk/WebKit/mac/ChangeLog

    r64409 r64421  
     12010-07-31  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/43300> Simplify variables in *.xcconfig files after adding iOS support
     4
     5        Reviewed by Darin Adler.
     6
     7        * Configurations/WebKit.xcconfig: Extracted
     8        PRODUCTION_FRAMEWORKS_DIR and PRODUCTION_ROOT variables.
     9
    1102010-07-30  Dan Bernstein  <mitz@apple.com>
    211

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

    r64390 r64421  
    4141FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(REAL_PLATFORM_NAME));
    4242FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    43 FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     43FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
    4444FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
    45 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     45FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
    4646FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    4747FRAMEWORK_SEARCH_PATHS_macosx = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
    … …  
    5656INSTALLHDRS_SCRIPT_PHASE = YES;
    5757PRODUCT_NAME = WebKit;
    58 UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
     58UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
    5959
    6060OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
    … …  
    6363OTHER_LDFLAGS_macosx = -sub_umbrella WebCore $(OTHER_LDFLAGS);
    6464
    65 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(REAL_PLATFORM_NAME));
    66 WEBCORE_PRIVATE_HEADERS_DIR_iphoneos = $(WEBCORE_PRIVATE_HEADERS_DIR_iphoneos_$(CONFIGURATION));
    67 WEBCORE_PRIVATE_HEADERS_DIR_iphoneos_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
    68 WEBCORE_PRIVATE_HEADERS_DIR_iphoneos_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
    69 WEBCORE_PRIVATE_HEADERS_DIR_iphoneos_Production = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/PrivateHeaders;
    70 WEBCORE_PRIVATE_HEADERS_DIR_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_iphoneos_$(CONFIGURATION));
    71 WEBCORE_PRIVATE_HEADERS_DIR_macosx = $(WEBCORE_PRIVATE_HEADERS_DIR_macosx_$(CONFIGURATION));
    72 WEBCORE_PRIVATE_HEADERS_DIR_macosx_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
    73 WEBCORE_PRIVATE_HEADERS_DIR_macosx_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
    74 WEBCORE_PRIVATE_HEADERS_DIR_macosx_Production = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
     65PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     66PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     67PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
     68PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
     69
     70PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
     71PRODUCTION_ROOT_iphoneos = $(SDKROOT);
     72PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
     73PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
     74
     75WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
     76WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
     77WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
     78WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(REAL_PLATFORM_NAME));
     79WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
     80WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
     81WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
    7582WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
    7683
    77 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(REAL_PLATFORM_NAME));
    78 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphoneos = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphoneos_$(CONFIGURATION));
    79 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphoneos_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    80 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphoneos_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    81 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphoneos_Production = $(SDKROOT)/usr/local/include;
    82 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphonesimulator = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_iphoneos_$(CONFIGURATION));
    83 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_macosx = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_macosx_$(CONFIGURATION));
    84 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_macosx_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    85 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_macosx_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    86 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_macosx_Production = $(NEXT_ROOT)/usr/local/include;
     84WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
     85WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
     86WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
     87WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
    8788WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include;
    8889
Note: See TracChangeset for help on using the changeset viewer.