Title: [287137] trunk/Source
Revision
287137
Author
[email protected]
Date
2021-12-16 08:48:23 -0800 (Thu, 16 Dec 2021)

Log Message

Source/_javascript_Core:
Create symlinks pointing to alternate root framework locations
https://bugs.webkit.org/show_bug.cgi?id=234374

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

* Configurations/_javascript_Core.xcconfig:
* _javascript_Core.xcodeproj/project.pbxproj:
* Scripts/create-symlink-to-altroot.sh: Added.

Source/ThirdParty/ANGLE:
https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

* ANGLE.xcodeproj/project.pbxproj:
* Configurations/ANGLE-dynamic.xcconfig:
* scripts/create-symlink-to-altroot.sh: Added.

Source/ThirdParty/libwebrtc:
https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

* Configurations/libwebrtc.xcconfig:

Source/WebCore:
https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

Covered by existing tests.

* Configurations/WebCore.xcconfig:
* Scripts/create-symlink-to-altroot.sh: Added.
* WebCore.xcodeproj/project.pbxproj:

Source/WebGPU:
https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

* Configurations/WebGPU.xcconfig:
* Scripts: Added.
* Scripts/create-symlink-to-altroot.sh: Added.
* WebGPU.xcodeproj/project.pbxproj:

Source/WebInspectorUI:
https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

* Configurations/WebInspectorUIFramework.xcconfig:
* Scripts/create-symlink-to-altroot.sh: Added.
* WebInspectorUI.xcodeproj/project.pbxproj:

Source/WebKit:
https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Filip Pizlo.

Added build variables and build step to create symlinks pointing to the alternate
build locations from the current framework install location.

* Configurations/BaseXPCService.xcconfig:
* Configurations/adattributiond.xcconfig:
* Configurations/webpushd.xcconfig:
* Scripts/create-symlink-to-altroot.sh: Added.
* WebKit.xcodeproj/project.pbxproj:

Modified Paths

Added Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (287136 => 287137)


--- trunk/Source/_javascript_Core/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/_javascript_Core/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,17 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        Create symlinks pointing to alternate root framework locations
+        https://bugs.webkit.org/show_bug.cgi?id=234374
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        * Configurations/_javascript_Core.xcconfig:
+        * _javascript_Core.xcodeproj/project.pbxproj:
+        * Scripts/create-symlink-to-altroot.sh: Added.
+
 2021-12-16  Devin Rousso  <[email protected]>
 
         Implement Array.prototype.groupBy and Array.prototype.groupByToMap

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (287136 => 287137)


--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -50,6 +50,11 @@
 PRODUCT_NAME = _javascript_Core;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
+ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
 INSTALLHDRS_SCRIPT_PHASE = YES;
 APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
 

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (287136 => 287137)


--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2021-12-16 16:48:23 UTC (rev 287137)
@@ -11279,6 +11279,7 @@
 				A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */,
 				1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */,
 				53609F9021DFFA9C008FA60A /* Check .xcfilelists */,
+				6577FFC6276AC8D20011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 				535E08C222545AC800DF00CA /* PBXBuildRule */,
@@ -11658,6 +11659,25 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\n# Skip for Production builds.\nif [[ ${CONFIGURATION:=Debug} == \"Production\" ]]; then\n    exit\nfi\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${_javascript_CORE_HELPERS_DIR}\"\nditto \"${BUILT_PRODUCTS_DIR}/jsc\" \"${BUILT_PRODUCTS_DIR}/${_javascript_CORE_HELPERS_DIR}/jsc\"\n";
 		};
+		6577FFC6276AC8D20011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
 		65788AA018B409EB00C189FF /* Offline Assemble */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Added: trunk/Source/_javascript_Core/Scripts/create-symlink-to-altroot.sh (0 => 287137)


--- trunk/Source/_javascript_Core/Scripts/create-symlink-to-altroot.sh	                        (rev 0)
+++ trunk/Source/_javascript_Core/Scripts/create-symlink-to-altroot.sh	2021-12-16 16:48:23 UTC (rev 287137)
@@ -0,0 +1,30 @@
+#!/bin/zsh
+
+set -e
+
+if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    exit 0
+fi
+
+if [[ "${SKIP_INSTALL}" = "YES" ]]; then
+    exit 0
+fi
+
+# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
+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}"
+
+if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
+
+    if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
+        exit 0
+    fi
+
+    echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
+elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
+    exit 1
+fi
+
+ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Property changes on: trunk/Source/_javascript_Core/Scripts/create-symlink-to-altroot.sh
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (287136 => 287137)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj	2021-12-16 16:48:23 UTC (rev 287137)
@@ -3508,6 +3508,7 @@
 				31CD00CE2491974C00486F27 /* CopyFiles */,
 				31CD00CF2491976800486F27 /* CopyFiles */,
 				31CD00D2249197FD00486F27 /* Adjust ANGLE Paths */,
+				6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 				31A9E9A0249AA04200C7E243 /* PBXBuildRule */,
@@ -3596,6 +3597,25 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n    # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\n    exit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.py\"\n";
 		};
+		6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/scripts/create-symlink-to-altroot.sh\"\n";
+		};
 		FFDA50D5269F895400AE11E2 /* Bake Metal Library to NSData */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287136 => 287137)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,17 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        * Configurations/ANGLE-dynamic.xcconfig:
+        * scripts/create-symlink-to-altroot.sh: Added.
+
 2021-12-15  Dean Jackson  <[email protected]>
 
         [ANGLE] clang with -Wunknown-warning-option will fail on -Wweak-template-vtables

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287136 => 287137)


--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -30,6 +30,11 @@
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
 
+ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
 HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google ${DERIVED_FILES_DIR};
 
 ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;

Added: trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh (0 => 287137)


--- trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh	                        (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh	2021-12-16 16:48:23 UTC (rev 287137)
@@ -0,0 +1,30 @@
+#!/bin/zsh
+
+set -e
+
+if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    exit 0
+fi
+
+if [[ "${SKIP_INSTALL}" = "YES" ]]; then
+    exit 0
+fi
+
+# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
+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}"
+
+if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
+
+    if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
+        exit 0
+    fi
+
+    echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
+elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
+    exit 1
+fi
+
+ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Property changes on: trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (287136 => 287137)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,15 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        * Configurations/libwebrtc.xcconfig:
+
 2021-12-10  Michael Saboff  <[email protected]>
 
         https://bugs.webkit.org/show_bug.cgi?id=234173

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (287136 => 287137)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -45,6 +45,11 @@
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
 
+ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
 GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 HEADER_SEARCH_PATHS = Source Source/third_party/jsoncpp/source/include Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/third_party/usrsctp Source/third_party/usrsctp/usrsctplib Source/third_party/usrsctp/usrsctplib/usrsctplib Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet Source/webrtc/modules/audio_device/ios Source/webrtc Source/webrtc/sdk/objc Source/webrtc/sdk/objc/base Source/webrtc/sdk/objc/Framework/Classes Source/third_party/libsrtp/config Source/webrtc/sdk/objc/Framework/Classes/Common Source/webrtc/sdk/objc/Framework/Classes/Video Source/webr
 tc/sdk/objc/Framework/Classes/PeerConnection Source/third_party/abseil-cpp Source/third_party/libvpx/source/libvpx Source/third_party/libwebm/webm_parser/include;
 

Modified: trunk/Source/WebCore/ChangeLog (287136 => 287137)


--- trunk/Source/WebCore/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebCore/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,19 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        Covered by existing tests.
+
+        * Configurations/WebCore.xcconfig:
+        * Scripts/create-symlink-to-altroot.sh: Added.
+        * WebCore.xcodeproj/project.pbxproj:
+
 2021-12-16  Alan Bujtas  <[email protected]>
 
         [LFC][IFC] Add support for mixed ltr/rtl content

Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (287136 => 287137)


--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -71,6 +71,14 @@
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
 
+ALTERNATE_ROOT_PATH[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+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);
+
 WK_ANGLE_LDFLAGS = -weak-lANGLE-shared;
 
 WK_WEBGPU_LDFLAGS = ; // To be filled-in after Apple update its internal build system.

Added: trunk/Source/WebCore/Scripts/create-symlink-to-altroot.sh (0 => 287137)


--- trunk/Source/WebCore/Scripts/create-symlink-to-altroot.sh	                        (rev 0)
+++ trunk/Source/WebCore/Scripts/create-symlink-to-altroot.sh	2021-12-16 16:48:23 UTC (rev 287137)
@@ -0,0 +1,30 @@
+#!/bin/zsh
+
+set -e
+
+if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    exit 0
+fi
+
+if [[ "${SKIP_INSTALL}" = "YES" ]]; then
+    exit 0
+fi
+
+# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
+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}"
+
+if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
+
+    if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
+        exit 0
+    fi
+
+    echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
+elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
+    exit 1
+fi
+
+ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Property changes on: trunk/Source/WebCore/Scripts/create-symlink-to-altroot.sh
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (287136 => 287137)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2021-12-16 16:48:23 UTC (rev 287137)
@@ -37977,6 +37977,7 @@
 				5DF50887116F3077005202AB /* Check For Inappropriate Files In Framework */,
 				71D6AA381DA4E69400B23969 /* Copy modern media controls code and assets */,
 				5379C7AA21E5287100E4A8F6 /* Check .xcfilelists */,
+				6577FFC7276AC9AD0011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -38244,6 +38245,25 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n    ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n\ntouch \"${TARGET_TEMP_DIR}/CheckForInappropriateFilesInFramework.txt\"\n";
 		};
+		6577FFC7276AC9AD0011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
 		71D6AA381DA4E69400B23969 /* Copy modern media controls code and assets */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Modified: trunk/Source/WebGPU/ChangeLog (287136 => 287137)


--- trunk/Source/WebGPU/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebGPU/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,18 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        * Configurations/WebGPU.xcconfig:
+        * Scripts: Added.
+        * Scripts/create-symlink-to-altroot.sh: Added.
+        * WebGPU.xcodeproj/project.pbxproj:
+
 2021-12-13  Elliott Williams  <[email protected]>
 
         Deployment target for macOS 11+ does not follow minor version bumps

Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (287136 => 287137)


--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -36,6 +36,11 @@
 DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
 
+ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
 PRODUCT_NAME = WebGPU;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 

Added: trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh (0 => 287137)


--- trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh	                        (rev 0)
+++ trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh	2021-12-16 16:48:23 UTC (rev 287137)
@@ -0,0 +1,30 @@
+#!/bin/zsh
+
+set -e
+
+if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    exit 0
+fi
+
+if [[ "${SKIP_INSTALL}" = "YES" ]]; then
+    exit 0
+fi
+
+# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
+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}"
+
+if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
+
+    if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
+        exit 0
+    fi
+
+    echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
+elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
+    exit 1
+fi
+
+ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Property changes on: trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property

Modified: trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (287136 => 287137)


--- trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj	2021-12-16 16:48:23 UTC (rev 287137)
@@ -345,6 +345,7 @@
 				1CEBD7DF2716AFBA00A5254D /* Sources */,
 				1CEBD7E02716AFBA00A5254D /* Frameworks */,
 				1CEBD7E12716AFBA00A5254D /* Resources */,
+				6577FFC8276ACA060011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -430,6 +431,28 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		6577FFC8276ACA060011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		1C023D3827449070001DB734 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

Modified: trunk/Source/WebInspectorUI/ChangeLog (287136 => 287137)


--- trunk/Source/WebInspectorUI/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebInspectorUI/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,17 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        * Configurations/WebInspectorUIFramework.xcconfig:
+        * Scripts/create-symlink-to-altroot.sh: Added.
+        * WebInspectorUI.xcodeproj/project.pbxproj:
+
 2021-12-16  Devin Rousso  <[email protected]>
 
         Implement Array.prototype.groupBy and Array.prototype.groupByToMap

Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (287136 => 287137)


--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -16,6 +16,11 @@
 PRODUCT_NAME = WebInspectorUI;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
+ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
 GCC_DYNAMIC_NO_PIC = NO;
 GCC_PRECOMPILE_PREFIX_HEADER = YES;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(inherited) FRAMEWORK_NAME=WebInspectorUI;

Added: trunk/Source/WebInspectorUI/Scripts/create-symlink-to-altroot.sh (0 => 287137)


--- trunk/Source/WebInspectorUI/Scripts/create-symlink-to-altroot.sh	                        (rev 0)
+++ trunk/Source/WebInspectorUI/Scripts/create-symlink-to-altroot.sh	2021-12-16 16:48:23 UTC (rev 287137)
@@ -0,0 +1,30 @@
+#!/bin/zsh
+
+set -e
+
+if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    exit 0
+fi
+
+if [[ "${SKIP_INSTALL}" = "YES" ]]; then
+    exit 0
+fi
+
+# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
+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}"
+
+if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
+
+    if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
+        exit 0
+    fi
+
+    echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
+elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
+    exit 1
+fi
+
+ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Property changes on: trunk/Source/WebInspectorUI/Scripts/create-symlink-to-altroot.sh
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property

Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (287136 => 287137)


--- trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj	2021-12-16 16:48:23 UTC (rev 287137)
@@ -89,6 +89,7 @@
 				A54C2255148B23DF00373FA3 /* Resources */,
 				1C60FF1214E6D9AF006CD77D /* Copy User Interface Resources */,
 				1C78EE1417611302002F6AA5 /* Sources */,
+				6577FFC9276ACA680011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -147,6 +148,25 @@
 			shellPath = /bin/sh;
 			shellScript = "/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"";
 		};
+		6577FFC9276ACA680011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Modified: trunk/Source/WebKit/ChangeLog (287136 => 287137)


--- trunk/Source/WebKit/ChangeLog	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebKit/ChangeLog	2021-12-16 16:48:23 UTC (rev 287137)
@@ -1,3 +1,19 @@
+2021-12-16  Michael Saboff  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Filip Pizlo.
+
+        Added build variables and build step to create symlinks pointing to the alternate
+        build locations from the current framework install location.
+
+        * Configurations/BaseXPCService.xcconfig:
+        * Configurations/adattributiond.xcconfig:
+        * Configurations/webpushd.xcconfig:
+        * Scripts/create-symlink-to-altroot.sh: Added.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2021-12-15  Brady Eidson  <[email protected]>
 
         Some webpushtool improvements.

Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (287136 => 287137)


--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -32,6 +32,11 @@
 INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
 INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
 
+ALTERNATE_ROOT_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
+
 APP_ICON = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;
 APP_ICON_Release = WebKit.icns;

Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (287136 => 287137)


--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -36,3 +36,8 @@
 
 INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
 INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
+
+ALTERNATE_ROOT_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
+
+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: trunk/Source/WebKit/Configurations/webpushd.xcconfig (287136 => 287137)


--- trunk/Source/WebKit/Configurations/webpushd.xcconfig	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebKit/Configurations/webpushd.xcconfig	2021-12-16 16:48:23 UTC (rev 287137)
@@ -41,3 +41,8 @@
 
 INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
 INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
+
+ALTERNATE_ROOT_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
+
+OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);

Added: trunk/Source/WebKit/Scripts/create-symlink-to-altroot.sh (0 => 287137)


--- trunk/Source/WebKit/Scripts/create-symlink-to-altroot.sh	                        (rev 0)
+++ trunk/Source/WebKit/Scripts/create-symlink-to-altroot.sh	2021-12-16 16:48:23 UTC (rev 287137)
@@ -0,0 +1,30 @@
+#!/bin/zsh
+
+set -e
+
+if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    exit 0
+fi
+
+if [[ "${SKIP_INSTALL}" = "YES" ]]; then
+    exit 0
+fi
+
+# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
+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}"
+
+if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
+
+    if [[ "${EXISTING_SYMLINK_VALUE}" == "${SYMLINK_VALUE}" ]]; then
+        exit 0
+    fi
+
+    echo "warning: existing symlink is incorrect; expected ${SYMLINK_VALUE}, got ${EXISTING_SYMLINK_VALUE}"
+elif [[ -e "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
+    echo "error: expected a symlink at ${OUTPUT_ALTERNATE_ROOT_PATH}"
+    exit 1
+fi
+
+ln -sf "${SYMLINK_VALUE}" "${OUTPUT_ALTERNATE_ROOT_PATH}"
Property changes on: trunk/Source/WebKit/Scripts/create-symlink-to-altroot.sh
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property

Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (287136 => 287137)


--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2021-12-16 16:10:09 UTC (rev 287136)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2021-12-16 16:48:23 UTC (rev 287137)
@@ -14038,6 +14038,7 @@
 				A15797632582B1A500528236 /* Copy Plug-ins */,
 				2D9FB222237523830049F936 /* Unlock keychain */,
 				2D9FB223237523830049F936 /* Process GPU entitlements */,
+				6577FFBF2769C7550011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14060,6 +14061,7 @@
 				372EBB402017E64300085064 /* Resources */,
 				A1EF36BF2581F73B0090B02A /* Copy Plug-ins */,
 				7AFCBD5520B8917D00F55C9C /* Process WebContent entitlements */,
+				6577FFBD2769C70F0011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14079,6 +14081,7 @@
 			buildPhases = (
 				517B5F57275A8D3E002DC22D /* Sources */,
 				517B5F58275A8D3E002DC22D /* Frameworks */,
+				6577FFC32769C8110011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14100,6 +14103,7 @@
 				5742A2F02535613F00B7BA14 /* Resources */,
 				5742A2F12535613F00B7BA14 /* Unlock keychain */,
 				5742A2F22535613F00B7BA14 /* Process WebAuthentication entitlements */,
+				6577FFC02769C7700011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14120,6 +14124,7 @@
 				5C1579D227165B2F00ED5280 /* Sources */,
 				5C1579D427165B2F00ED5280 /* Frameworks */,
 				5C1579D527165B2F00ED5280 /* Process webpushd Entitlements */,
+				6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14140,6 +14145,7 @@
 				5CAF7A9D26F93A750003F19E /* Sources */,
 				5CAF7A9F26F93A750003F19E /* Frameworks */,
 				5C1578E6270E129400ED5280 /* Process adattributiond Entitlements */,
+				6577FFC12769C7BB0011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14161,6 +14167,7 @@
 				7A7E8DEE2748392500DCC97A /* Resources */,
 				7A7E8DF02748392500DCC97A /* Copy Plug-ins */,
 				7A7E8DF22748392500DCC97A /* Process WebContent entitlements */,
+				6577FFBC2769C6D90011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14206,6 +14213,7 @@
 				512B81CA273CAFBE00D87D49 /* Create symlinks to Daemons for engineering builds */,
 				0FB94836239F31B700926A8F /* Copy Testing Headers */,
 				DFD03A29270D5F57001A996E /* Copy Daemon Plists */,
+				6577FFB92769C1460011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 				535E08C422545B7200DF00CA /* PBXBuildRule */,
@@ -14248,6 +14256,7 @@
 				A1EF36D42581F7D70090B02A /* Copy Plug-ins */,
 				7AFCBD5420B8911D00F55C9C /* Process WebContent entitlements */,
 				4157853721279CC600DD3800 /* Copy Custom WebContent Resources to Framework Private Headers */,
+				6577FFBB2769C6AA0011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14270,6 +14279,7 @@
 				BC8283AF16B4BF7700A278FE /* Resources */,
 				41D0FC8020E43B4500076AE8 /* Unlock keychain */,
 				41D0FC8120E43B7000076AE8 /* Process Network entitlements */,
+				6577FFBE2769C7370011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14289,6 +14299,7 @@
 				CD95493126159004008372D9 /* Headers */,
 				CD95493226159004008372D9 /* Sources */,
 				CD95493326159004008372D9 /* Frameworks */,
+				6577FFBA2769C64A0011AEC8 /* Create Symlink to Alt Root Path */,
 			);
 			buildRules = (
 			);
@@ -14878,6 +14889,215 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n    ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n";
 		};
+		6577FFB92769C1460011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFBA2769C64A0011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFBB2769C6AA0011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFBC2769C6D90011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFBD2769C70F0011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFBE2769C7370011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFBF2769C7550011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFC02769C7700011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFC12769C7BB0011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
+		6577FFC32769C8110011AEC8 /* Create Symlink to Alt Root Path */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Create Symlink to Alt Root Path";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${OUTPUT_ALTERNATE_ROOT_PATH}",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = /bin/zsh;
+			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+		};
 		7A7E8DF22748392500DCC97A /* Process WebContent entitlements */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to