[webkit-changes] [294855] trunk/Source

Wed, 25 May 2022 18:16:58 -0700

Title: [294855] trunk/Source
Revision
294855
Author
david_ques...@apple.com
Date
2022-05-25 18:16:04 -0700 (Wed, 25 May 2022)

Log Message

USE_SYSTEM_CONTENT_PATH and USE_STAGING_INSTALL_PATH should be able to coexist
https://bugs.webkit.org/show_bug.cgi?id=240723
rdar://92000421

Reviewed by Michael Saboff.

Make it possible to build with both USE_SYSTEM_CONTENT_PATH and USE_STAGING_INSTALL_PATH
enabled. With USE_STAGING_INSTALL_PATH, all the frameworks and dylibs will be relocated
to a common "StagedFrameworks" directory, but USE_SYSTEM_CONTENT_PATH directs the build
to locate this directory at a different location, i.e. in a system content path. The
presence of USE_STAGING_INSTALL_PATH also disables all targets' current behavior of
creating symlinks into the system content path -- in this configuration, the frameworks
only need to be referenceable from their location in the StagedFrameworks directory.

Throughout this patch, there are multiple common changes to the same build settings:

INSTALL_PATH_PREFIX:
    This variable adds the system content path as a prefix to products' install paths.
    Leave it empty when USE_STAGING_INSTALL_PATH is set, as the effective prefix will
    be baked into WK_OVERRIDE_FRAMEWORKS_DIR via WK_INSTALL_PATH_PREFIX instead.
OUTPUT_ALTERNATE_ROOT_PATH:
    Define this as empty under USE_STAGING_INSTALL_PATH, since we don't need to create
    the symlinks pointing into the system content path.
WK_INSTALL_PATH_PREFIX:
    This variable is used to define a prefix for the override install path when using
    staged frameworks. Use a different prefix under USE_SYSTEM_CONTENT_PATH. Also
    remove a now-unneeded comparison against WK_MACOS_1015. WebKit doesn't support
    building for versions of macOS prior to 10.15, so this *always* would evaluate to
    'MACOS_SINCE_1015'.

No new tests; no behavior should be changed. (Except for output of this particular
build configuration.)

* Source/_javascript_Core/Configurations/Base.xcconfig:
    Update INSTALL_PATH_PREFIX and WK_INSTALL_PATH_PREFIX.
* Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
    Update OUTPUT_ALTERNATE_ROOT_PATH.
* Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig:
    Update INSTALL_PATH_PREFIX.
* Source/ThirdParty/ANGLE/Configurations/Base.xcconfig:
    Update WK_INSTALL_PATH_PREFIX.
* Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:
    Moved the common definition of INSTALL_PATH_PREFIX here, updated WK_INSTALL_PATH_PREFIX.
* Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig:
    Removed definition of INSTALL_PATH_PREFIX, which has been moved to Base.xcconfig. (x9)
* Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh:
    Avoid creating any symlinks when USE_STAGING_INSTALL_PATH is set.
* Source/WebCore/Configurations/WebCore.xcconfig:
    Update INSTALL_PATH_PREFIX and WK_INSTALL_PATH_PREFIX.
* Source/WebCore/PAL/Configurations/PAL.xcconfig:
    Update WK_INSTALL_PATH_PREFIX.
* Source/WebGPU/Configurations/WebGPU.xcconfig:
    Update INSTALL_PATH_PREFIX, OUTPUT_ALTERNATE_ROOT_PATH, and WK_INSTALL_PATH_PREFIX.
* Source/WebInspectorUI/Configurations/Base.xcconfig:
    Update WK_INSTALL_PATH_PREFIX.
* Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig:
    Modify the definition of INSTALL_PATH so that the "override-ness" of
    WK_USE_OVERRIDE_FRAMEWORKS_DIR takes precedence over USE_SYSTEM_CONTENT_PATH. With
    these two set, WebInspectorUI.framework should end up in the override path (e.g. the
    StagedFrameworks directory), rather than the standard system content path location.
    Also update OUTPUT_ALTERNATE_ROOT_PATH.
* Source/WebKit/Configurations/Base.xcconfig:
    Update INSTALL_PATH_PREFIX.
* Source/WebKit/Configurations/BaseTarget.xcconfig:
    Update WK_INSTALL_PATH_PREFIX.
* Source/WebKit/Configurations/WebKit.xcconfig:
    Update OUTPUT_ALTERNATE_ROOT_PATH.
* Source/WebKit/Configurations/adattributiond.xcconfig:
    Somewhat unrelated tweak -- remove WK_OVERRIDE_FRAMEWORKS_DIR from this file since
    it is redundant with the definition of this setting in BaseTarget.xcconfig.
* Source/WebKitLegacy/mac/Configurations/Base.xcconfig:
    Update INSTALL_PATH_PREFIX.
* Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:
    Update WK_INSTALL_PATH_PREFIX.

Canonical link: https://commits.webkit.org/250989@main

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (294854 => 294855)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -31,8 +31,8 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
@@ -174,8 +174,10 @@
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (294854 => 294855)


--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -71,8 +71,8 @@
 
 ALTERNATE_ROOT_PATH = $(_javascript_CORE_FRAMEWORKS_DIR);
 
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)));
+OUTPUT_ALTERNATE_ROOT_PATH_YES_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
 
 INSTALLHDRS_SCRIPT_PHASE = YES;
 APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -14,8 +14,8 @@
 ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -lz;
 ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
 STAGED_DYLIB_FRAMEWORK_PATH=/WebCore.framework/Versions/A/Frameworks
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -97,8 +97,10 @@
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
 ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -123,13 +123,18 @@
 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
+
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
 WK_LLVM_LTO_NO = NO;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -7,9 +7,6 @@
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS = Source/third_party/boringssl/src/include;
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -23,9 +23,6 @@
 
 PRODUCT_NAME = absl;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
 PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
 PUBLIC_HEADERS_FOLDER_PATH_not_legacy = $(INSTALL_PATH_PREFIX)/usr/local/include/absl;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -7,9 +7,6 @@
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS = Source/third_party/libsrtp/include Source/third_party/libsrtp/config Source/third_party/boringssl/src/include Source/third_party/libsrtp Source/third_party/libsrtp/crypto/include;
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -7,9 +7,6 @@
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS[arch=x86_64] = Source/third_party/libvpx/source/config/mac/x64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
 HEADER_SEARCH_PATHS[arch=arm64*] = Source/third_party/libvpx/source/config/ios/arm64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -5,9 +5,6 @@
 CLANG_WARN_INT_CONVERSION = YES;
 GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS = Source/third_party/libwebm Source/third_party/libwebm/webm_parser Source/third_party/libwebm/webm_parser/include;
 
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -31,8 +31,6 @@
 EXPORTED_SYMBOLS_FILE[sdk=iphoneos*] = Configurations/libwebrtc.iOS.exp;
 EXPORTED_SYMBOLS_FILE[sdk=iphonesimulator*] = Configurations/libwebrtc.iOSsim.exp;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
 STAGED_DYLIB_FRAMEWORK_PATH=/WebCore.framework/Versions/A/Frameworks
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -7,9 +7,6 @@
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS = Source/third_party/libyuv/include;
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -9,9 +9,6 @@
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS = Source/third_party/opus/src/include Source/third_party/opus/src/celt Source/third_party/opus/src/silk Source/third_party/opus/src/silk/float Source/third_party/opus/src;
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -7,9 +7,6 @@
 COMBINE_HIDPI_IMAGES = NO;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
-
 HEADER_SEARCH_PATHS = Source/ Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/ Source/third_party/usrsctp/usrsctplib/usrsctplib/ Source/third_party/boringssl/src/include/;
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;

Modified: trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh (294854 => 294855)


--- trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh	2022-05-26 01:16:04 UTC (rev 294855)
@@ -2,7 +2,7 @@
 
 set -e
 
-if [[ "${SKIP_INSTALL}" == "YES" ]]; then
+if [[ "${SKIP_INSTALL}" == "YES" || "${USE_STAGING_INSTALL_PATH}" == "YES" ]]; then
     exit 0
 fi

Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (294854 => 294855)


--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -74,8 +74,8 @@
 HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
 INFOPLIST_FILE = Info.plist;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari/
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
@@ -231,8 +231,10 @@
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_PLATFORM_NAME));
 WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES_macosx = -Wl,-not_for_dyld_shared_cache;

Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (294854 => 294855)


--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -73,8 +73,10 @@
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 WTF_BUILD_SCRIPTS_DIR = $(WTF_BUILD_SCRIPTS_DIR_$(CONFIGURATION));
 WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);

Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (294854 => 294855)


--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -41,8 +41,8 @@
 
 INFOPLIST_FILE = Info.plist;
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBGPU_FRAMEWORKS_DIR);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
@@ -58,8 +58,8 @@
 
 ALTERNATE_ROOT_PATH = $(WEBGPU_FRAMEWORKS_DIR);
 
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)));
+OUTPUT_ALTERNATE_ROOT_PATH_YES_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
 
 INSTALLHDRS_SCRIPT_PHASE = YES;
 
@@ -80,8 +80,10 @@
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 GCC_PREPROCESSOR_DEFINITIONS = WGPU_SHARED_LIBRARY WGPU_IMPLEMENTATION $(inherited);

Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (294854 => 294855)


--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -103,8 +103,10 @@
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
 WK_COCOA_TOUCH_iphoneos = cocoatouch;

Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (294854 => 294855)


--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -6,12 +6,14 @@
 
 INFOPLIST_FILE = Info.plist
 
-INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_ = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO);
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_USE_SYSTEM_CONTENT_PATH_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_USE_SYSTEM_CONTENT_PATH_NO);
+
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
@@ -25,8 +27,8 @@
 
 ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
 
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)));
+OUTPUT_ALTERNATE_ROOT_PATH_YES_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
 
 GCC_DYNAMIC_NO_PIC = NO;
 GCC_PRECOMPILE_PREFIX_HEADER = YES;

Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (294854 => 294855)


--- trunk/Source/WebKit/Configurations/Base.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -29,8 +29,8 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO

Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (294854 => 294855)


--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -133,8 +133,10 @@
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 // webpushd should not be installed when building for downlevel.
 WK_SKIP_INSTALL_WEBPUSHD[sdk=macos*] = $(WK_SKIP_INSTALL_WEBPUSHD_STAGING_$(USE_STAGING_INSTALL_PATH)_RELOCATABLE_$(WK_RELOCATABLE_FRAMEWORKS))

Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (294854 => 294855)


--- trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -46,8 +46,8 @@
 
 ALTERNATE_ROOT_PATH = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)));
+OUTPUT_ALTERNATE_ROOT_PATH_YES_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
 
 LIBRARY_SEARCH_PATHS = $(inherited) "$(LIBWEBRTC_LIBRARY_DIR)";

Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (294854 => 294855)


--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -35,9 +35,6 @@
 WK_CODE_SIGN_FLAGS_iphoneos = --entitlements $(WK_PROCESSED_XCENT_FILE);
 OTHER_CODE_SIGN_FLAGS = $(WK_CODE_SIGN_FLAGS);
 
-WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";

Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (294854 => 294855)


--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -32,8 +32,8 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(USE_STAGING_INSTALL_PATH)));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES_YES = $(SYSTEM_CONTENT_PATH);
 SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari/
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
 COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (294854 => 294855)


--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-05-26 00:47:32 UTC (rev 294854)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-05-26 01:16:04 UTC (rev 294855)
@@ -176,8 +176,10 @@
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
-WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_NO = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_STAGING_INSTALL_PATH_YES_USE_SYSTEM_CONTENT_PATH_ = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
 
 SUPPORTS_TEXT_BASED_API[sdk=iphone*] = YES;
 SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to