Diff
Modified: branches/safari-613.1.14.5-branch/Source/_javascript_Core/ChangeLog (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/_javascript_Core/ChangeLog 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/_javascript_Core/ChangeLog 2022-02-04 01:40:56 UTC (rev 289094)
@@ -1,3 +1,83 @@
+2022-02-03 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r289091. rdar://problem/88387438
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Source/_javascript_Core:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-03 Michael Saboff <msab...@apple.com>
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
2022-01-27 Russell Epstein <repst...@apple.com>
Cherry-pick r288710. rdar://problem/88100509
Modified: branches/safari-613.1.14.5-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -46,7 +46,7 @@
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR)
-DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_YES = $(_javascript_CORE_FRAMEWORKS_DIR);
PRODUCT_NAME = _javascript_Core;
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
Modified: branches/safari-613.1.14.5-branch/Source/ThirdParty/ANGLE/ChangeLog (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-02-04 01:40:56 UTC (rev 289094)
@@ -1,3 +1,82 @@
+2022-02-03 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r289091. rdar://problem/88387438
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Source/_javascript_Core:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-03 Michael Saboff <msab...@apple.com>
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2022-01-14 Russell Epstein <repst...@apple.com>
Cherry-pick r288041. rdar://problem/87627318
Modified: branches/safari-613.1.14.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -26,8 +26,8 @@
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
-DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);
-DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
+DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
HEADER_SEARCH_PATHS = ${DERIVED_FILES_DIR} include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google ${DERIVED_FILES_DIR};
Modified: branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/ChangeLog (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-02-04 01:40:56 UTC (rev 289094)
@@ -1,3 +1,82 @@
+2022-02-03 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r289091. rdar://problem/88387438
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Source/_javascript_Core:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-03 Michael Saboff <msab...@apple.com>
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
2022-01-27 Russell Epstein <repst...@apple.com>
Cherry-pick r288710. rdar://problem/88100509
Modified: branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -42,7 +42,7 @@
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);
-DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
Modified: branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog 2022-02-04 01:40:56 UTC (rev 289094)
@@ -1,3 +1,84 @@
+2022-02-03 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r289091. rdar://problem/88387438
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Source/_javascript_Core:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-03 Michael Saboff <msab...@apple.com>
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
2022-01-28 Russell Epstein <repst...@apple.com>
Cherry-pick r288766. rdar://problem/88207448
Modified: branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -67,7 +67,7 @@
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_PLATFORM_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_PLATFORM_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_PLATFORM_YES = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_PLATFORM_YES = $(WEBCORE_FRAMEWORKS_DIR);
INSTALLHDRS_COPY_PHASE = YES;
INSTALLHDRS_SCRIPT_PHASE = YES;
PRODUCT_NAME = WebCore;
@@ -158,15 +158,13 @@
NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
+WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+WEBCORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
+WEBCORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=iphone*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=macosx*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO);
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-02-04 01:40:56 UTC (rev 289094)
@@ -1,3 +1,94 @@
+2022-02-03 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r289091. rdar://problem/88387438
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Source/_javascript_Core:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-03 Michael Saboff <msab...@apple.com>
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
2022-02-01 Russell Epstein <repst...@apple.com>
Cherry-pick r288917. rdar://problem/88334496
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/Base.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/Base.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/Base.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -29,6 +29,9 @@
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);
+
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -66,10 +66,7 @@
NORMAL_WEBKIT_FRAMEWORKS_DIR = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks;
-WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO);
-WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseXPCService.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseXPCService.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/BaseXPCService.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -29,8 +29,8 @@
EXECUTABLE_SUFFIX = $(WK_XPC_SERVICE_SUFFIX);
-INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
+INSTALL_PATH[sdk=iphone*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
APP_ICON = $(APP_ICON_$(CONFIGURATION));
APP_ICON_Debug = WebKit.icns;
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/Shim.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/Shim.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/Shim.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -26,4 +26,4 @@
GCC_DYNAMIC_NO_PIC = NO;
SKIP_INSTALL = YES;
-INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKit.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -33,14 +33,11 @@
MODULEMAP_FILE_cocoatouch = Modules/iOS.modulemap;
MODULEMAP_FILE_ = Modules/OSX.modulemap;
-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 = $(WEBKIT_FRAMEWORKS_DIR);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_YES = $(WEBKIT_FRAMEWORKS_DIR);
ALTERNATE_ROOT_PATH = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKitSwift.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKitSwift.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKitSwift.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -27,9 +27,11 @@
PRODUCT_NAME = libWebKitSwift;
SWIFT_OBJC_INTERFACE_HEADER_NAME = WebKitSwift-Swift.h
-INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks;
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
+INSTALL_PATH[sdk=iphone*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks;
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
+DYLIB_INSTALL_NAME_BASE = $(WEBKIT_FRAMEWORKS_DIR);
+
WK_HAVE_COORDINATOR = $(WK_HAVE_COORDINATOR_$(WK_PLATFORM_NAME));
WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200));
WK_HAVE_COORDINATOR_MACOS_SINCE_1200 = YES;
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -34,5 +34,5 @@
WK_CODE_SIGN_FLAGS_iphoneos = --entitlements $(WK_PROCESSED_XCENT_FILE);
OTHER_CODE_SIGN_FLAGS = $(WK_CODE_SIGN_FLAGS);
-INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
+INSTALL_PATH[sdk=iphone*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -41,5 +41,5 @@
OTHER_CODE_SIGN_FLAGS[sdk=macos*] = $(OTHER_CODE_SIGN_FLAGS_$(USE_INTERNAL_SDK));
OTHER_CODE_SIGN_FLAGS_YES = --entitlements $(WK_PROCESSED_XCENT_FILE);
-INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
+INSTALL_PATH[sdk=iphone*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
Modified: branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/ChangeLog (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/ChangeLog 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/ChangeLog 2022-02-04 01:40:56 UTC (rev 289094)
@@ -1,3 +1,88 @@
+2022-02-03 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r289091. rdar://problem/88387438
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Source/_javascript_Core:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the
+ system content path prefix.
+
+ * Configurations/_javascript_Core.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix.
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production.
+ This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+ Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations.
+ - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/Shim.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-02-03 Michael Saboff <msab...@apple.com>
+
+ WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=236105
+
+ Reviewed by Saam Barati.
+
+ Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path
+ prepended. This refactoring includes:
+ - Created INSTALL_PATH_PREFIX to have the system content path when in use.
+ - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH.
+ - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants.
+ - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
2022-01-28 Russell Epstein <repst...@apple.com>
Cherry-pick r288766. rdar://problem/88207448
Modified: branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -31,6 +31,9 @@
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);
+
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
Modified: branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (289093 => 289094)
--- branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-02-04 01:32:46 UTC (rev 289093)
+++ branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-02-04 01:40:56 UTC (rev 289094)
@@ -62,16 +62,13 @@
HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
INFOPLIST_FILE = mac/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 = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_COCOA_TOUCH_NO = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
-INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-INSTALL_PATH_COCOA_TOUCH_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_COCOA_TOUCH_NO = $(INSTALL_PATH_PREFIX)$(WEBKIT_LEGACY_FRAMEWORKS_DIR);
-
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_YES = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALLHDRS_COPY_PHASE = YES;
@@ -124,8 +121,10 @@
NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_COCOA_TOUCH_NO = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(SDKROOT)$(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
