- Revision
- 288593
- Author
- msab...@apple.com
- Date
- 2022-01-25 17:11:36 -0800 (Tue, 25 Jan 2022)
Log Message
Install build failure when using SYSTEM_CONTENT_PATH
https://bugs.webkit.org/show_bug.cgi?id=235609
Reviewed by Filip Pizlo.
Source/ThirdParty/libwebrtc:
Change the Create Symlinks to Alternate Root script to create the links for the headers
for both the install headers and install phases.
* Scripts/create-symlink-to-altroot.sh:
Source/WebKit:
Eliminated the Output Files of the Create Symlink to Alt Root Path script for the targets
adattributiond, GPU, Networking, WebAuthn, webpushd, and the various WebContent targets,
since the symlink to WebKit.framework will be created by the "WebKit" target.
Also fixed the INSTALL_PATH for adattributiond and webpushd to follow the difference between
macOS and iOS.
* Configurations/adattributiond.xcconfig:
* Configurations/webpushd.xcconfig:
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (288592 => 288593)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-26 01:11:36 UTC (rev 288593)
@@ -1,3 +1,15 @@
+2022-01-25 Michael Saboff <msab...@apple.com>
+
+ Install build failure when using SYSTEM_CONTENT_PATH
+ https://bugs.webkit.org/show_bug.cgi?id=235609
+
+ Reviewed by Filip Pizlo.
+
+ Change the Create Symlinks to Alternate Root script to create the links for the headers
+ for both the install headers and install phases.
+
+ * Scripts/create-symlink-to-altroot.sh:
+
2022-01-24 Youenn Fablet <you...@apple.com>
Cherry-pick WebRTC 235826 change
Modified: trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh (288592 => 288593)
--- trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh 2022-01-26 01:11:36 UTC (rev 288593)
@@ -2,18 +2,14 @@
set -e
-if [[ "${ACTION}" == "installhdrs" && ( -z "${SYSTEM_PUBLIC_HEADER_PREFIX}" || -z "${HEADER_FOLDER_LIST}" ) ]]; then
+if [[ "${SKIP_INSTALL}" == "YES" ]]; then
exit 0
fi
-if [[ "${ACTION}" == "install" && ( -z "${SYSTEM_PUBLIC_LIBRARY_PREFIX}" || -z "${LIBRARY_LIST}" ) ]]; then
+if [[ -z "${SYSTEM_PUBLIC_HEADER_PREFIX}" || -z "${HEADER_FOLDER_LIST}" || -z "${SYSTEM_PUBLIC_LIBRARY_PREFIX}" || -z "${LIBRARY_LIST}" ]]; then
exit 0
fi
-if [[ "${SKIP_INSTALL}" == "YES" ]]; then
- exit 0
-fi
-
create_symlink_if_needed()
{
INSTALL_FOLDER_PREFIX=$1
@@ -43,7 +39,7 @@
ln -sf "${SYMLINK_VALUE}" "${SYSTEM_HEADER_PATH}"
}
-if [[ "${ACTION}" == "installhdrs" ]]
+if [[ "${ACTION}" == "installhdrs" || "${ACTION}" == "install" ]]
then
if [[ ! -d ${SYSTEM_PUBLIC_HEADER_PREFIX} ]]; then
mkdir -p ${SYSTEM_PUBLIC_HEADER_PREFIX}
Modified: trunk/Source/WebKit/ChangeLog (288592 => 288593)
--- trunk/Source/WebKit/ChangeLog 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/WebKit/ChangeLog 2022-01-26 01:11:36 UTC (rev 288593)
@@ -1,3 +1,20 @@
+2022-01-25 Michael Saboff <msab...@apple.com>
+
+ Install build failure when using SYSTEM_CONTENT_PATH
+ https://bugs.webkit.org/show_bug.cgi?id=235609
+
+ Reviewed by Filip Pizlo.
+
+ Eliminated the Output Files of the Create Symlink to Alt Root Path script for the targets
+ adattributiond, GPU, Networking, WebAuthn, webpushd, and the various WebContent targets,
+ since the symlink to WebKit.framework will be created by the "WebKit" target.
+ Also fixed the INSTALL_PATH for adattributiond and webpushd to follow the difference between
+ macOS and iOS.
+
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
2022-01-25 Per Arne Vollan <pvol...@apple.com>
[macOS][WP] Allow mach extension to service
Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (288592 => 288593)
--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 01:11:36 UTC (rev 288593)
@@ -37,7 +37,7 @@
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;
+ALTERNATE_ROOT_PATH = $(INSTALL_PATH);
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 (288592 => 288593)
--- trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 01:11:36 UTC (rev 288593)
@@ -44,7 +44,7 @@
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;
+ALTERNATE_ROOT_PATH = $(INSTALL_PATH);
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/WebKit.xcodeproj/project.pbxproj (288592 => 288593)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 01:11:36 UTC (rev 288593)
@@ -14954,7 +14954,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14973,7 +14972,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14992,7 +14990,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15011,7 +15008,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15030,7 +15026,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15049,7 +15044,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15068,7 +15062,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15087,7 +15080,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15106,7 +15098,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15125,7 +15116,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
