- Revision
- 288597
- Author
- [email protected]
- Date
- 2022-01-25 17:36:24 -0800 (Tue, 25 Jan 2022)
Log Message
Cherry-pick r288593. rdar://problem/87906922
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/ChangeLog (288596 => 288597)
--- branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-26 01:35:29 UTC (rev 288596)
+++ branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-26 01:36:24 UTC (rev 288597)
@@ -1,3 +1,46 @@
+2022-01-25 Russell Epstein <[email protected]>
+
+ Cherry-pick r288593. rdar://problem/87906922
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-25 Michael Saboff <[email protected]>
+
+ 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-21 Russell Epstein <[email protected]>
Cherry-pick r288391. rdar://problem/87829404
Modified: branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh (288596 => 288597)
--- branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh 2022-01-26 01:35:29 UTC (rev 288596)
+++ branches/safari-613.1.14.5-branch/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh 2022-01-26 01:36:24 UTC (rev 288597)
@@ -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: branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog (288596 => 288597)
--- branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-01-26 01:35:29 UTC (rev 288596)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-01-26 01:36:24 UTC (rev 288597)
@@ -1,3 +1,51 @@
+2022-01-25 Russell Epstein <[email protected]>
+
+ Cherry-pick r288593. rdar://problem/87906922
+
+ 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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-25 Michael Saboff <[email protected]>
+
+ 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-09 Sam Weinig <[email protected]>
Remove support for Direct2D
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig (288596 => 288597)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 01:35:29 UTC (rev 288596)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 01:36:24 UTC (rev 288597)
@@ -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: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig (288596 => 288597)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 01:35:29 UTC (rev 288596)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 01:36:24 UTC (rev 288597)
@@ -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: branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288596 => 288597)
--- branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 01:35:29 UTC (rev 288596)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 01:36:24 UTC (rev 288597)
@@ -14915,7 +14915,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14934,7 +14933,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14953,7 +14951,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14972,7 +14969,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -14991,7 +14987,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15010,7 +15005,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15029,7 +15023,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15048,7 +15041,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15067,7 +15059,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
@@ -15086,7 +15077,6 @@
outputFileListPaths = (
);
outputPaths = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
