Title: [288756] branches/safari-613.1.14.5-branch/Source
- Revision
- 288756
- Author
- [email protected]
- Date
- 2022-01-28 12:18:19 -0800 (Fri, 28 Jan 2022)
Log Message
Cherry-pick r288749. rdar://problem/87928380
Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path
https://bugs.webkit.org/show_bug.cgi?id=235821
Reviewed by Saam Barati.
Source/WebCore:
The value of _javascript_CORE_PRIVATE_HEADERS_DIR for Catalyst builds had the system content prefix
after the Catalyst prefix. I reversed them.
* Configurations/WebCore.xcconfig:
Source/WebKit:
Eliminated the system content prefix from ALTERNATE_ROOT_PATH since it is the old location.
Changed the create symlink script to create the directory path leading up to the symlink because
it isn't created for Catalyst builds.
* Configurations/SDKVariant.xcconfig:
* Configurations/WebKit.xcconfig:
* Scripts/create-symlink-to-altroot.sh:
* WebKit.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog (288755 => 288756)
--- branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog 2022-01-28 20:09:32 UTC (rev 288755)
+++ branches/safari-613.1.14.5-branch/Source/WebCore/ChangeLog 2022-01-28 20:18:19 UTC (rev 288756)
@@ -1,3 +1,44 @@
+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
+ https://bugs.webkit.org/show_bug.cgi?id=235821
+
+ Reviewed by Saam Barati.
+
+ Source/WebCore:
+
+ The value of _javascript_CORE_PRIVATE_HEADERS_DIR for Catalyst builds had the system content prefix
+ after the Catalyst prefix. I reversed them.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Eliminated the system content prefix from ALTERNATE_ROOT_PATH since it is the old location.
+ Changed the create symlink script to create the directory path leading up to the symlink because
+ it isn't created for Catalyst builds.
+
+ * Configurations/SDKVariant.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Scripts/create-symlink-to-altroot.sh:
+ * WebKit.xcodeproj/project.pbxproj:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-28 Michael Saboff <[email protected]>
+
+ Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235821
+
+ Reviewed by Saam Barati.
+
+ The value of _javascript_CORE_PRIVATE_HEADERS_DIR for Catalyst builds had the system content prefix
+ after the Catalyst prefix. I reversed them.
+
+ * Configurations/WebCore.xcconfig:
+
2022-01-27 Russell Epstein <[email protected]>
Cherry-pick r288710. rdar://problem/88100509
Modified: branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig (288755 => 288756)
--- branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-28 20:09:32 UTC (rev 288755)
+++ branches/safari-613.1.14.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-28 20:18:19 UTC (rev 288756)
@@ -184,7 +184,7 @@
_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_YES = $(SDKROOT)$(INSTALL_PATH_PREFIX)$(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;
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog (288755 => 288756)
--- branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-01-28 20:09:32 UTC (rev 288755)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-01-28 20:18:19 UTC (rev 288756)
@@ -1,3 +1,48 @@
+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
+ https://bugs.webkit.org/show_bug.cgi?id=235821
+
+ Reviewed by Saam Barati.
+
+ Source/WebCore:
+
+ The value of _javascript_CORE_PRIVATE_HEADERS_DIR for Catalyst builds had the system content prefix
+ after the Catalyst prefix. I reversed them.
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebKit:
+
+ Eliminated the system content prefix from ALTERNATE_ROOT_PATH since it is the old location.
+ Changed the create symlink script to create the directory path leading up to the symlink because
+ it isn't created for Catalyst builds.
+
+ * Configurations/SDKVariant.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Scripts/create-symlink-to-altroot.sh:
+ * WebKit.xcodeproj/project.pbxproj:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-28 Michael Saboff <[email protected]>
+
+ Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235821
+
+ Reviewed by Saam Barati.
+
+ Eliminated the system content prefix from ALTERNATE_ROOT_PATH since it is the old location.
+ Changed the create symlink script to create the directory path leading up to the symlink because
+ it isn't created for Catalyst builds.
+
+ * Configurations/SDKVariant.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Scripts/create-symlink-to-altroot.sh:
+ * WebKit.xcodeproj/project.pbxproj:
+
2022-01-27 Russell Epstein <[email protected]>
Cherry-pick r288710. rdar://problem/88100509
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKit.xcconfig (288755 => 288756)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-01-28 20:09:32 UTC (rev 288755)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-01-28 20:18:19 UTC (rev 288756)
@@ -42,7 +42,7 @@
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);
+ALTERNATE_ROOT_PATH = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Scripts/create-symlink-to-altroot.sh (288755 => 288756)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Scripts/create-symlink-to-altroot.sh 2022-01-28 20:09:32 UTC (rev 288755)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Scripts/create-symlink-to-altroot.sh 2022-01-28 20:18:19 UTC (rev 288756)
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
set -e
@@ -14,6 +14,12 @@
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}"
+OUTPUT_ALTERNATE_ROOT_DIR=`dirname ${OUTPUT_ALTERNATE_ROOT_PATH}`
+
+if [[ ! -d ${OUTPUT_ALTERNATE_ROOT_DIR} ]]; then
+ mkdir -p ${OUTPUT_ALTERNATE_ROOT_DIR}
+fi
+
if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288755 => 288756)
--- branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-28 20:09:32 UTC (rev 288755)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-28 20:18:19 UTC (rev 288756)
@@ -14892,7 +14892,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14911,7 +14910,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
