Diff
Modified: trunk/Source/WebCore/ChangeLog (288691 => 288692)
--- trunk/Source/WebCore/ChangeLog 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebCore/ChangeLog 2022-01-27 20:03:04 UTC (rev 288692)
@@ -1,3 +1,18 @@
+2022-01-27 Elliott Williams <[email protected]>
+
+ Generated xcfilelists contain symlinks when building for macOS
+ https://bugs.webkit.org/show_bug.cgi?id=235663
+ rdar://88054903
+
+ Introduce a build variable that expands to `Versions/A` when building for macOS, so that our
+ input filelists refer to the resolved location of headers and other files inside of
+ framework bundles. This fixes task dependencies which were not being detected by XCBuild.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebCore.xcconfig:
+
2022-01-27 Wenson Hsieh <[email protected]>
ImageAnalysisQueue should prioritize elements that intersect the visible viewport
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -148,6 +148,9 @@
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
WK_XCODE_SUPPORTS_LTO = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_10_2_$(XCODE_VERSION_MAJOR)));
WK_XCODE_SUPPORTS_LTO[arch=arm*] = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_11_4_$(XCODE_VERSION_MAJOR)));
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (288691 => 288692)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -185,9 +185,9 @@
_javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Debug = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Production = $(_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/PrivateHeaders;
-_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;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h;
Modified: trunk/Source/WebInspectorUI/ChangeLog (288691 => 288692)
--- trunk/Source/WebInspectorUI/ChangeLog 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebInspectorUI/ChangeLog 2022-01-27 20:03:04 UTC (rev 288692)
@@ -1,3 +1,14 @@
+2022-01-27 Elliott Williams <[email protected]>
+
+ Generated xcfilelists contain symlinks when building for macOS
+ https://bugs.webkit.org/show_bug.cgi?id=235663
+ rdar://88054903
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
2022-01-26 Antoine Quint <[email protected]>
[Web Inspector] Update return value name for Animation.requestEffectTarget()
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -118,6 +118,9 @@
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
WK_XCODE_SUPPORTS_LTO = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_10_2_$(XCODE_VERSION_MAJOR)));
WK_XCODE_SUPPORTS_LTO[arch=arm*] = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_11_4_$(XCODE_VERSION_MAJOR)));
Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (288691 => 288692)
--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -38,9 +38,9 @@
_javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Debug = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Production = $(_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/PrivateHeaders;
-_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;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
SUPPORTS_TEXT_BASED_API = YES;
Modified: trunk/Source/WebKit/ChangeLog (288691 => 288692)
--- trunk/Source/WebKit/ChangeLog 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/ChangeLog 2022-01-27 20:03:04 UTC (rev 288692)
@@ -1,3 +1,18 @@
+2022-01-27 Elliott Williams <[email protected]>
+
+ Generated xcfilelists contain symlinks when building for macOS
+ https://bugs.webkit.org/show_bug.cgi?id=235663
+ rdar://88054903
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
2022-01-27 Ada Chan <[email protected]>
Disable WebXR experimental feature by default
Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Source/WebKit/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -150,6 +150,9 @@
WK_MACOS_WEAK_FRAMEWORK_cocoatouch = -framework
WK_MACOS_WEAK_FRAMEWORK_ = -weak_framework
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
WK_USE_RESTRICTED_ENTITLEMENTS = $(USE_INTERNAL_SDK);
EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a _javascript_Core.framework
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (288691 => 288692)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -95,9 +95,9 @@
_javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Debug = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Production = $(_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/PrivateHeaders;
-_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;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)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);
@@ -112,8 +112,8 @@
UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
-WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (288691 => 288692)
--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -29,8 +29,7 @@
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 = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)XPCServices;
ALTERNATE_ROOT_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
Modified: trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig (288691 => 288692)
--- trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -27,8 +27,7 @@
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 = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Frameworks;
WK_HAVE_COORDINATOR = $(WK_HAVE_COORDINATOR_$(WK_PLATFORM_NAME));
WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200));
Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (288691 => 288692)
--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -34,5 +34,4 @@
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 = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
Modified: trunk/Source/WebKit/Configurations/webpushd.xcconfig (288691 => 288692)
--- trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -41,7 +41,6 @@
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 = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
SKIP_INSTALL = $(WK_SKIP_INSTALL_WEBPUSHD)
Modified: trunk/Source/WebKitLegacy/ChangeLog (288691 => 288692)
--- trunk/Source/WebKitLegacy/ChangeLog 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKitLegacy/ChangeLog 2022-01-27 20:03:04 UTC (rev 288692)
@@ -1,3 +1,18 @@
+2022-01-27 Elliott Williams <[email protected]>
+
+ Generated xcfilelists contain symlinks when building for macOS
+ https://bugs.webkit.org/show_bug.cgi?id=235663
+ rdar://88054903
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/BaseTarget.xcconfig:
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/WebKitSwift.xcconfig:
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+
2022-01-21 Sihui Liu <[email protected]>
Disable CFURLCache in WebKit2
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (288691 => 288692)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-01-27 20:03:04 UTC (rev 288692)
@@ -1,3 +1,14 @@
+2022-01-27 Elliott Williams <[email protected]>
+
+ Generated xcfilelists contain symlinks when building for macOS
+ https://bugs.webkit.org/show_bug.cgi?id=235663
+ rdar://88054903
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
2022-01-27 Ada Chan <[email protected]>
Disable WebXR experimental feature by default
Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -138,6 +138,9 @@
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
WK_XCODE_SUPPORTS_LTO = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_10_2_$(XCODE_VERSION_MAJOR)));
WK_XCODE_SUPPORTS_LTO[arch=arm*] = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_11_4_$(XCODE_VERSION_MAJOR)));
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (288691 => 288692)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -136,11 +136,11 @@
WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(WK_DEFAULT_PLATFORM_NAME)_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
WTF_BUILD_SCRIPTS_DIR = $(WTF_BUILD_SCRIPTS_DIR_$(CONFIGURATION));
WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
Modified: trunk/Tools/ChangeLog (288691 => 288692)
--- trunk/Tools/ChangeLog 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Tools/ChangeLog 2022-01-27 20:03:04 UTC (rev 288692)
@@ -1,3 +1,15 @@
+2022-01-27 Elliott Williams <[email protected]>
+
+ Generated xcfilelists contain symlinks when building for macOS
+ https://bugs.webkit.org/show_bug.cgi?id=235663
+ rdar://88054903
+
+ Reviewed by Alexey Proskuryakov.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+
2022-01-27 Wenson Hsieh <[email protected]>
ImageAnalysisQueue should prioritize elements that intersect the visible viewport
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -115,8 +115,8 @@
WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
AD_HOC_CODE_SIGNING_ALLOWED = YES;
CODE_SIGN_IDENTITY = -;
@@ -140,6 +140,9 @@
WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH));
HEADER_SEARCH_PATHS_ = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
HEADER_SEARCH_PATHS_cocoatouch = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit/Platform/spi/ios;
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -100,7 +100,7 @@
SDKROOT = macosx.internal;
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH));
EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.h *IOS.cpp *IOS.mm;
@@ -124,6 +124,9 @@
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=appletv*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/appletvos/$(WK_TARGET_TVOS_VERSION_MAJOR);
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=watch*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/watchos/$(WK_TARGET_WATCHOS_VERSION_MAJOR);
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(SYSTEM_FRAMEWORK_SEARCH_PATHS_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)) $(WK_PRIVATE_FRAMEWORKS_DIR) $(inherited);
SYSTEM_FRAMEWORK_SEARCH_PATHS_YES = $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/PrivateFrameworks $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/Frameworks $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/Frameworks/Quartz.framework/Frameworks;
SYSTEM_FRAMEWORK_SEARCH_PATHS_NO = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks;
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (288691 => 288692)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2022-01-27 19:59:02 UTC (rev 288691)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2022-01-27 20:03:04 UTC (rev 288692)
@@ -112,8 +112,8 @@
WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=macos*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(TARGET_MAC_OS_X_VERSION_MAJOR);
@@ -134,6 +134,9 @@
WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
+WK_FRAMEWORK_VERSION_PREFIX =;
+WK_FRAMEWORK_VERSION_PREFIX[sdk=macosx*] = Versions/A/;
+
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH));
HEADER_SEARCH_PATHS_ = ;
HEADER_SEARCH_PATHS_cocoatouch = $(SRCROOT)/../../Source/WebKit/Platform/spi/ios $(SRCROOT)/../../Source/WebKit/Platform/spi/watchos;
