Title: [287400] branches/safari-613.1.12-branch/Source/WebCore
- Revision
- 287400
- Author
- alanc...@apple.com
- Date
- 2021-12-23 09:29:35 -0800 (Thu, 23 Dec 2021)
Log Message
Cherry-pick r287361. rdar://problem/86855206
Fix WebCore install headers with alternate build
https://bugs.webkit.org/show_bug.cgi?id=234592
Reviewed by Filip Pizlo.
Covered by existing tests.
Fixed OUTPUT_ALTERNATE_ROOT_PATH for macOS to return an empty value since we don't need a symlink
as the WebCore framework is in a subdirectory of WebKit.framework.
Fixed typos with NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES rules,
eliminating the ')'s at the end of the lines.
* Configurations/WebCore.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287361 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.12-branch/Source/WebCore/ChangeLog (287399 => 287400)
--- branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-23 17:29:31 UTC (rev 287399)
+++ branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-23 17:29:35 UTC (rev 287400)
@@ -1,5 +1,42 @@
2021-12-23 Alan Coon <alanc...@apple.com>
+ Cherry-pick r287361. rdar://problem/86855206
+
+ Fix WebCore install headers with alternate build
+ https://bugs.webkit.org/show_bug.cgi?id=234592
+
+ Reviewed by Filip Pizlo.
+
+ Covered by existing tests.
+
+ Fixed OUTPUT_ALTERNATE_ROOT_PATH for macOS to return an empty value since we don't need a symlink
+ as the WebCore framework is in a subdirectory of WebKit.framework.
+ Fixed typos with NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES rules,
+ eliminating the ')'s at the end of the lines.
+
+ * Configurations/WebCore.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287361 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-22 Michael Saboff <msab...@apple.com>
+
+ Fix WebCore install headers with alternate build
+ https://bugs.webkit.org/show_bug.cgi?id=234592
+
+ Reviewed by Filip Pizlo.
+
+ Covered by existing tests.
+
+ Fixed OUTPUT_ALTERNATE_ROOT_PATH for macOS to return an empty value since we don't need a symlink
+ as the WebCore framework is in a subdirectory of WebKit.framework.
+ Fixed typos with NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES rules,
+ eliminating the ')'s at the end of the lines.
+
+ * Configurations/WebCore.xcconfig:
+
+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/WebCore/Configurations/WebCore.xcconfig (287399 => 287400)
--- branches/safari-613.1.12-branch/Source/WebCore/Configurations/WebCore.xcconfig 2021-12-23 17:29:31 UTC (rev 287399)
+++ branches/safari-613.1.12-branch/Source/WebCore/Configurations/WebCore.xcconfig 2021-12-23 17:29:35 UTC (rev 287400)
@@ -75,10 +75,11 @@
ALTERNATE_ROOT_PATH[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_PLATFORM_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH[sdk=macosx*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=iphone*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
-OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=macosx*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+OUTPUT_ALTERNATE_ROOT_PATH[sdk=macosx*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+OUTPUT_ALTERNATE_ROOT_PATH_YES_YES[sdk=macosx*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
WK_ANGLE_LDFLAGS = -weak-lANGLE-shared;
WK_WEBGPU_LDFLAGS = ; // To be filled-in after Apple update its internal build system.
@@ -157,8 +158,8 @@
WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
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_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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
