Changeset 288710 in webkit for trunk/Source/JavaScriptCore/Scripts

Timestamp:

Jan 27, 2022, 4:24:20 PM (3 years ago)

Author:

[email protected]

Message:

com.apple.WebKit.WebAuthn.xpc fails to build with system content path
​https://bugs.webkit.org/show_bug.cgi?id=235734

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

Adjusted build path variables to handle the case when building for Catalyst.
Did this by refactoring how the optional system content path is added as a prefix to paths.
As a result, modified the create symlink script to not be dependent on the target location,
since it isn't created when doing a catalyst build. Instead the script creates the parent
directory of the symlink if it doesn't exisst.

• Configurations/Base.xcconfig:
• Configurations/JSC.xcconfig:
• Configurations/JavaScriptCore.xcconfig:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Scripts/create-symlink-to-altroot.sh:

Source/ThirdParty/libwebrtc:

Added explicit PUBLIC_HEADERS_FOLDER_PATH vavriable. Otherwise we get the
project version with didn't include the "libwebrtc" component.

• Configurations/libwebrtc.xcconfig:

Source/WebCore:

Since WebCore is installed under the WebKit framework on macOS, we don't need a symlink for the
WebCore.framework itself. As a result, modified the create symlink script to not be dependent
on the target location, since it isn't created when doing a catalyst build.
Instead the script creates the parent directory of the symlink if it doesn't exisst.

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

Source/WebKit:

Since we symlink the the whole framework when building the main "WebKit" target,
we can eliminate the create symlink script for the WebAuth target.
Eliminated the setting of ALTERNATE_ROOT_PATH build variables for all XPC services.

• Configurations/BaseXPCService.xcconfig:
• WebKit.xcodeproj/project.pbxproj:

File:

• trunk/Source/JavaScriptCore/Scripts/create-symlink-to-altroot.sh (modified) (2 diffs)

trunk/Source/JavaScriptCore/Scripts/create-symlink-to-altroot.sh

@@ -1 @@
-#!/bin/zsh
+#!/bin/sh
 
 set -e
@@ -15 +15 @@
 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}")