Title: [290960] trunk/Source/WebGPU
Revision
290960
Author
msab...@apple.com
Date
2022-03-07 15:08:24 -0800 (Mon, 07 Mar 2022)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Source/WebGPU/ChangeLog (290959 => 290960)


--- trunk/Source/WebGPU/ChangeLog	2022-03-07 23:07:55 UTC (rev 290959)
+++ trunk/Source/WebGPU/ChangeLog	2022-03-07 23:08:24 UTC (rev 290960)
@@ -1,3 +1,17 @@
+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-06  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         [WebGPU] Use C++ references instead of pointers where applicable

Modified: trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh (290959 => 290960)


--- trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh	2022-03-07 23:07:55 UTC (rev 290959)
+++ trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh	2022-03-07 23:08:24 UTC (rev 290960)
@@ -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: trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (290959 => 290960)


--- trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj	2022-03-07 23:07:55 UTC (rev 290959)
+++ trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj	2022-03-07 23:08:24 UTC (rev 290960)
@@ -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

Reply via email to