⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 287382 in webkit


Ignore:
Timestamp:
Dec 22, 2021, 7:10:16 PM (5 years ago)
Author:
msaboff@apple.com
Message:

Fix WebKit Build issues when using system content path
​https://bugs.webkit.org/show_bug.cgi?id=234624

Reviewed by Filip Pizlo.

Source/ThirdParty/ANGLE:

Changed INSTALL_PATH on macOS builds to use a fully qualified .../WebCore.framework/Versions/A/Frameworks.
Deleted unused create-symlink-to-altroot.sh script.

  • Configurations/ANGLE-dynamic.xcconfig:
  • scripts/create-symlink-to-altroot.sh: Removed.

Source/ThirdParty/libwebrtc:

Changed INSTALL_PATH on macOS builds to use fully qualified .../WebCore.framework/Versions/A/Frameworks.

  • Configurations/libwebrtc.xcconfig:

Source/WebCore:

Covered by existing tests.

Added SYSTEM_CONTENT_PATH processing to WebCore's normal location.

  • Configurations/WebCore.xcconfig:

Source/WebKit:

Added SYSTEM_CONTENT_PATH processing to the nested frameworks path (UMBRELLA_FRAMEWORKS_DIR).

  • Configurations/BaseTarget.xcconfig:
  • Configurations/WebKit.xcconfig:

Source/WebKitLegacy/mac:

Added SYSTEM_CONTENT_PATH processing to NORMAL_PRODUCTION_FRAMEWORKS_DIR.

  • Configurations/WebKitLegacy.xcconfig:
Location:
trunk/Source
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r287326 r287382  
     12021-12-22  Michael Saboff  <msaboff@apple.com>
     2
     3        Fix WebKit Build issues when using system content path
     4        https://bugs.webkit.org/show_bug.cgi?id=234624
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Changed INSTALL_PATH on macOS builds to use a fully qualified .../WebCore.framework/Versions/A/Frameworks.
     9        Deleted unused create-symlink-to-altroot.sh script.
     10
     11        * Configurations/ANGLE-dynamic.xcconfig:
     12        * scripts/create-symlink-to-altroot.sh: Removed.
     13
    1142021-12-21  Michael Saboff  <msaboff@apple.com>
    215

  • trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig

    r287326 r287382  
    1616
    1717INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
    18 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
     18INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    1919INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
    20 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
     20INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    2121INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
    2222INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r287137 r287382  
     12021-12-22  Michael Saboff  <msaboff@apple.com>
     2
     3        Fix WebKit Build issues when using system content path
     4        https://bugs.webkit.org/show_bug.cgi?id=234624
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Changed INSTALL_PATH on macOS builds to use fully qualified .../WebCore.framework/Versions/A/Frameworks.
     9
     10        * Configurations/libwebrtc.xcconfig:
     11
    1122021-12-16  Michael Saboff  <msaboff@apple.com>
    213

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

    r287137 r287382  
    3333
    3434INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
    35 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
     35INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    3636INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
    3737INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;

  • trunk/Source/WebCore/ChangeLog

    r287380 r287382  
     12021-12-22  Michael Saboff  <msaboff@apple.com>
     2
     3        Fix WebKit Build issues when using system content path
     4        https://bugs.webkit.org/show_bug.cgi?id=234624
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Covered by existing tests.
     9
     10        Added SYSTEM_CONTENT_PATH processing to WebCore's normal location.
     11
     12        * Configurations/WebCore.xcconfig:
     13
    1142021-12-22  Brent Fulgham  <bfulgham@apple.com>
    215

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r287361 r287382  
    151151SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,WebCore.order;
    152152
    153 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
    154 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
     153NORMAL_WEBCORE_FRAMEWORKS_PREFIX = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
     154NORMAL_WEBCORE_FRAMEWORKS_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
     155
     156NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX)$(PRODUCTION_FRAMEWORKS_DIR);
     157NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    155158
    156159WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));

  • trunk/Source/WebKit/ChangeLog

    r287381 r287382  
     12021-12-22  Michael Saboff  <msaboff@apple.com>
     2
     3        Fix WebKit Build issues when using system content path
     4        https://bugs.webkit.org/show_bug.cgi?id=234624
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Added SYSTEM_CONTENT_PATH processing to the nested frameworks path (UMBRELLA_FRAMEWORKS_DIR).
     9
     10        * Configurations/BaseTarget.xcconfig:
     11        * Configurations/WebKit.xcconfig:
     12
    1132021-12-22  Aditya Keerthi  <akeerthi@apple.com>
    214

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

    r286896 r287382  
    100100JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
    101101
     102UMBRELLA_FRAMEWORKS_PREFIX = $(UMBRELLA_FRAMEWORKS_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
     103UMBRELLA_FRAMEWORKS_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
     104
    102105UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
    103106UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
    104107UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
    105108UMBRELLA_FRAMEWORKS_DIR_Production = $(UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    106 UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     109UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    107110UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    108 UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
     111UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(UMBRELLA_FRAMEWORKS_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    109112UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    110113UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);

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

    r286896 r287382  
    4343DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
    4444
     45ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
     46
     47OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
     48OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
     49
    4550LIBRARY_SEARCH_PATHS = $(inherited) "$(LIBWEBRTC_LIBRARY_DIR)";
    4651

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r287339 r287382  
     12021-12-22  Michael Saboff  <msaboff@apple.com>
     2
     3        Fix WebKit Build issues when using system content path
     4        https://bugs.webkit.org/show_bug.cgi?id=234624
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Added SYSTEM_CONTENT_PATH processing to NORMAL_PRODUCTION_FRAMEWORKS_DIR.
     9
     10        * Configurations/WebKitLegacy.xcconfig:
     11
    1122021-12-21  Brady Eidson  <beidson@apple.com>
    213

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

    r286896 r287382  
    117117WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    118118
     119NORMAL_PRODUCTION_FRAMEWORKS_PREFIX = $(NORMAL_PRODUCTION_FRAMEWORKS_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
     120NORMAL_PRODUCTION_FRAMEWORKS_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
     121
    119122NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    120 NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    121 NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
     123NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(SDKROOT)$(NORMAL_PRODUCTION_FRAMEWORKS_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     124NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_NO = $(NEXT_ROOT)$(NORMAL_PRODUCTION_FRAMEWORKS_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks;
    122125
    123126PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
Note: See TracChangeset for help on using the changeset viewer.