Diff
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-12-23 17:29:40 UTC (rev 287401)
@@ -1,5 +1,65 @@
2021-12-23 Alan Coon <alanc...@apple.com>
+ Cherry-pick r287382. rdar://problem/86855207
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-22 Michael Saboff <msab...@apple.com>
+
+ Fix WebKit Build issues when using system content path
+ https://bugs.webkit.org/show_bug.cgi?id=234624
+
+ Reviewed by Filip Pizlo.
+
+ 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.
+
+2021-12-23 Alan Coon <alanc...@apple.com>
+
Cherry-pick r287326. rdar://problem/86855216
Fix symlinks for alternate root framework locations
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-23 17:29:40 UTC (rev 287401)
@@ -15,9 +15,9 @@
ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz;
INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
Deleted: branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh 2021-12-23 17:29:40 UTC (rev 287401)
@@ -1,30 +0,0 @@
-#!/bin/zsh
-
-set -e
-
-if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
- exit 0
-fi
-
-if [[ "${SKIP_INSTALL}" = "YES" ]]; then
- exit 0
-fi
-
-# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
-RELATIVE_PATH_FROM_SYMLINK_TO_ROOT=$(echo "${ALTERNATE_ROOT_PATH}" | sed -E -e "s/\/[a-zA-Z0-9_]+/..\//g" -e "s/\/$//")
-SYMLINK_VALUE="${RELATIVE_PATH_FROM_SYMLINK_TO_ROOT}${INSTALL_PATH}/${FULL_PRODUCT_NAME}"
-
-if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
- EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
-
- if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
- exit 0
- fi
-
- echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
-elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
- echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
- exit 1
-fi
-
-ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/ChangeLog (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/ChangeLog 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/ChangeLog 2021-12-23 17:29:40 UTC (rev 287401)
@@ -1,3 +1,61 @@
+2021-12-23 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r287382. rdar://problem/86855207
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-22 Michael Saboff <msab...@apple.com>
+
+ Fix WebKit Build issues when using system content path
+ https://bugs.webkit.org/show_bug.cgi?id=234624
+
+ Reviewed by Filip Pizlo.
+
+ Changed INSTALL_PATH on macOS builds to use fully qualified .../WebCore.framework/Versions/A/Frameworks.
+
+ * Configurations/libwebrtc.xcconfig:
+
2021-12-16 Alan Coon <alanc...@apple.com>
Cherry-pick r287137. rdar://problem/86476583
Modified: branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2021-12-23 17:29:40 UTC (rev 287401)
@@ -32,7 +32,7 @@
EXPORTED_SYMBOLS_FILE[sdk=iphonesimulator*] = Configurations/libwebrtc.iOSsim.exp;
INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
Modified: branches/safari-613.1.12-branch/Source/WebCore/ChangeLog (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-23 17:29:40 UTC (rev 287401)
@@ -1,5 +1,65 @@
2021-12-23 Alan Coon <alanc...@apple.com>
+ Cherry-pick r287382. rdar://problem/86855207
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-22 Michael Saboff <msab...@apple.com>
+
+ Fix WebKit Build issues when using system content path
+ https://bugs.webkit.org/show_bug.cgi?id=234624
+
+ Reviewed by Filip Pizlo.
+
+ Covered by existing tests.
+
+ Added SYSTEM_CONTENT_PATH processing to WebCore's normal location.
+
+ * Configurations/WebCore.xcconfig:
+
+2021-12-23 Alan Coon <alanc...@apple.com>
+
Cherry-pick r287361. rdar://problem/86855206
Fix WebCore install headers with alternate build
Modified: branches/safari-613.1.12-branch/Source/WebCore/Configurations/WebCore.xcconfig (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebCore/Configurations/WebCore.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebCore/Configurations/WebCore.xcconfig 2021-12-23 17:29:40 UTC (rev 287401)
@@ -150,9 +150,12 @@
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,WebCore.order;
-NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+NORMAL_WEBCORE_FRAMEWORKS_PREFIX = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
+NORMAL_WEBCORE_FRAMEWORKS_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX)$(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX)$(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_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
Modified: branches/safari-613.1.12-branch/Source/WebKit/ChangeLog (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebKit/ChangeLog 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebKit/ChangeLog 2021-12-23 17:29:40 UTC (rev 287401)
@@ -1,3 +1,62 @@
+2021-12-23 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r287382. rdar://problem/86855207
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-22 Michael Saboff <msab...@apple.com>
+
+ Fix WebKit Build issues when using system content path
+ https://bugs.webkit.org/show_bug.cgi?id=234624
+
+ Reviewed by Filip Pizlo.
+
+ Added SYSTEM_CONTENT_PATH processing to the nested frameworks path (UMBRELLA_FRAMEWORKS_DIR).
+
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/WebKit.xcconfig:
+
2021-12-16 Alan Coon <alanc...@apple.com>
Cherry-pick r287146. rdar://problem/86550488
Modified: branches/safari-613.1.12-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-23 17:29:40 UTC (rev 287401)
@@ -99,13 +99,16 @@
_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders;
_javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/PrivateHeaders;
+UMBRELLA_FRAMEWORKS_PREFIX = $(UMBRELLA_FRAMEWORKS_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+UMBRELLA_FRAMEWORKS_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+
UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
UMBRELLA_FRAMEWORKS_DIR_Production = $(UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
UMBRELLA_FRAMEWORKS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(UMBRELLA_FRAMEWORKS_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
Modified: branches/safari-613.1.12-branch/Source/WebKit/Configurations/WebKit.xcconfig (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebKit/Configurations/WebKit.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebKit/Configurations/WebKit.xcconfig 2021-12-23 17:29:40 UTC (rev 287401)
@@ -42,6 +42,11 @@
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
+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);
+
LIBRARY_SEARCH_PATHS = $(inherited) "$(LIBWEBRTC_LIBRARY_DIR)";
WK_ACCESSIBILITY_LDFLAGS = $(WK_ACCESSIBILITY_LDFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
Modified: branches/safari-613.1.12-branch/Source/WebKitLegacy/mac/ChangeLog (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebKitLegacy/mac/ChangeLog 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebKitLegacy/mac/ChangeLog 2021-12-23 17:29:40 UTC (rev 287401)
@@ -1,3 +1,61 @@
+2021-12-23 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r287382. rdar://problem/86855207
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-22 Michael Saboff <msab...@apple.com>
+
+ Fix WebKit Build issues when using system content path
+ https://bugs.webkit.org/show_bug.cgi?id=234624
+
+ Reviewed by Filip Pizlo.
+
+ Added SYSTEM_CONTENT_PATH processing to NORMAL_PRODUCTION_FRAMEWORKS_DIR.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
2021-12-11 Antti Koivisto <an...@apple.com>
Remove redundant StyleRule::Type enum
Modified: branches/safari-613.1.12-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (287400 => 287401)
--- branches/safari-613.1.12-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
+++ branches/safari-613.1.12-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-12-23 17:29:40 UTC (rev 287401)
@@ -116,9 +116,12 @@
WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+NORMAL_PRODUCTION_FRAMEWORKS_PREFIX = $(NORMAL_PRODUCTION_FRAMEWORKS_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
+NORMAL_PRODUCTION_FRAMEWORKS_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+
NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(SDKROOT)$(NORMAL_PRODUCTION_FRAMEWORKS_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_NO = $(NEXT_ROOT)$(NORMAL_PRODUCTION_FRAMEWORKS_PREFIX)$(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);
