Title: [290962] branches/safari-614.1.5-branch/Source/WebGPU
- Revision
- 290962
- Author
- repst...@apple.com
- Date
- 2022-03-07 15:50:42 -0800 (Mon, 07 Mar 2022)
Log Message
Cherry-pick r290960. rdar://problem/89920518
Catalyst build failure in WebGPU when building with SYSTEM_CONTENT_PATH
https://bugs.webkit.org/show_bug.cgi?id=237542
Reviewed by Saam Barati.
Updated create-symlink-to-altroot.sh to create the directory containing the output if is doesn't
exist in lieu of specifying an output file in the build step.
This is the way that other projects are configured.
* Scripts/create-symlink-to-altroot.sh:
* WebGPU.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290960 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog (290961 => 290962)
--- branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog 2022-03-07 23:47:37 UTC (rev 290961)
+++ branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog 2022-03-07 23:50:42 UTC (rev 290962)
@@ -1,3 +1,36 @@
+2022-03-07 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r290960. rdar://problem/89920518
+
+ Catalyst build failure in WebGPU when building with SYSTEM_CONTENT_PATH
+ https://bugs.webkit.org/show_bug.cgi?id=237542
+
+ Reviewed by Saam Barati.
+
+ Updated create-symlink-to-altroot.sh to create the directory containing the output if is doesn't
+ exist in lieu of specifying an output file in the build step.
+ This is the way that other projects are configured.
+
+ * Scripts/create-symlink-to-altroot.sh:
+ * WebGPU.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290960 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-07 Michael Saboff <msab...@apple.com>
+
+ Catalyst build failure in WebGPU when building with SYSTEM_CONTENT_PATH
+ https://bugs.webkit.org/show_bug.cgi?id=237542
+
+ Reviewed by Saam Barati.
+
+ Updated create-symlink-to-altroot.sh to create the directory containing the output if is doesn't
+ exist in lieu of specifying an output file in the build step.
+ This is the way that other projects are configured.
+
+ * Scripts/create-symlink-to-altroot.sh:
+ * WebGPU.xcodeproj/project.pbxproj:
+
2022-03-03 Russell Epstein <repst...@apple.com>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/WebGPU/Scripts/create-symlink-to-altroot.sh (290961 => 290962)
--- branches/safari-614.1.5-branch/Source/WebGPU/Scripts/create-symlink-to-altroot.sh 2022-03-07 23:47:37 UTC (rev 290961)
+++ branches/safari-614.1.5-branch/Source/WebGPU/Scripts/create-symlink-to-altroot.sh 2022-03-07 23:50:42 UTC (rev 290962)
@@ -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-614.1.5-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (290961 => 290962)
--- branches/safari-614.1.5-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-03-07 23:47:37 UTC (rev 290961)
+++ branches/safari-614.1.5-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-03-07 23:50:42 UTC (rev 290962)
@@ -561,7 +561,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
