Title: [288767] branches/safari-613.1.14.5-branch/Source
- Revision
- 288767
- Author
- [email protected]
- Date
- 2022-01-28 16:38:48 -0800 (Fri, 28 Jan 2022)
Log Message
Cherry-pick r288766. rdar://problem/88207448
Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path
https://bugs.webkit.org/show_bug.cgi?id=235839
Reviewed by Saam Barati.
Source/WebCore:
Fixed ALTERNATE_ROOT_PATH to have a proper path for Catalyst builds, but not for normal macOS builds
since they are under WebKit.framework.
* Configurations/WebCore.xcconfig:
Source/WebKitLegacy/mac:
Fixed ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH to have proper paths for Catalyst builds,
but not for normal macOS builds since they are under WebKit.framework.
* Configurations/WebKitLegacy.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288766 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog (288766 => 288767)
--- branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog 2022-01-29 00:36:24 UTC (rev 288766)
+++ branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog 2022-01-29 00:38:48 UTC (rev 288767)
@@ -1,5 +1,43 @@
2022-01-28 Russell Epstein <[email protected]>
+ Cherry-pick r288766. rdar://problem/88207448
+
+ Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235839
+
+ Reviewed by Saam Barati.
+
+ Source/WebCore:
+
+ Fixed ALTERNATE_ROOT_PATH to have a proper path for Catalyst builds, but not for normal macOS builds
+ since they are under WebKit.framework.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Fixed ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH to have proper paths for Catalyst builds,
+ but not for normal macOS builds since they are under WebKit.framework.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288766 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-28 Michael Saboff <[email protected]>
+
+ Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235839
+
+ Reviewed by Saam Barati.
+
+ Fixed ALTERNATE_ROOT_PATH to have a proper path for Catalyst builds, but not for normal macOS builds
+ since they are under WebKit.framework.
+
+ * Configurations/WebCore.xcconfig:
+
+2022-01-28 Russell Epstein <[email protected]>
+
Cherry-pick r288749. rdar://problem/87928380
Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path
Modified: branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig (288766 => 288767)
--- branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-29 00:36:24 UTC (rev 288766)
+++ branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-29 00:38:48 UTC (rev 288767)
@@ -75,6 +75,8 @@
UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
ALTERNATE_ROOT_PATH[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+ALTERNATE_ROOT_PATH[sdk=macosx*] = $(ALTERNATE_ROOT_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+ALTERNATE_ROOT_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=iphone*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
Modified: branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/ChangeLog (288766 => 288767)
--- branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/ChangeLog 2022-01-29 00:36:24 UTC (rev 288766)
+++ branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/ChangeLog 2022-01-29 00:38:48 UTC (rev 288767)
@@ -1,3 +1,41 @@
+2022-01-28 Russell Epstein <[email protected]>
+
+ Cherry-pick r288766. rdar://problem/88207448
+
+ Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235839
+
+ Reviewed by Saam Barati.
+
+ Source/WebCore:
+
+ Fixed ALTERNATE_ROOT_PATH to have a proper path for Catalyst builds, but not for normal macOS builds
+ since they are under WebKit.framework.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ Fixed ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH to have proper paths for Catalyst builds,
+ but not for normal macOS builds since they are under WebKit.framework.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288766 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-28 Michael Saboff <[email protected]>
+
+ Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235839
+
+ Reviewed by Saam Barati.
+
+ Fixed ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH to have proper paths for Catalyst builds,
+ but not for normal macOS builds since they are under WebKit.framework.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
2022-01-11 Russell Epstein <[email protected]>
Cherry-pick r287884. rdar://problem/87206692
Modified: branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (288766 => 288767)
--- branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-01-29 00:36:24 UTC (rev 288766)
+++ branches/safari-613.1.14.5-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-01-29 00:38:48 UTC (rev 288767)
@@ -79,10 +79,15 @@
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
ALTERNATE_ROOT_PATH[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+ALTERNATE_ROOT_PATH[sdk=macosx*] = $(ALTERNATE_ROOT_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+ALTERNATE_ROOT_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(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[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);
+
PRODUCT_NAME = WebKitLegacy;
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
