Build failure - webkit daemons don't need symlink with system content path
https://bugs.webkit.org/show_bug.cgi?id=235648
Reviewed by Darin Adler.
Removed the create symlinks for the WebKit daemons since they are under the symlink for
/System/Library/WebKit.framework.
* Configurations/adattributiond.xcconfig:
* Configurations/webpushd.xcconfig:
* WebKit.xcodeproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 95fc4e4..e18f47f 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2022-01-26 Michael Saboff <msaboff@apple.com>
+
+ Build failure - webkit daemons don't need symlink with system content path
+ https://bugs.webkit.org/show_bug.cgi?id=235648
+
+ Reviewed by Darin Adler.
+
+ Removed the create symlinks for the WebKit daemons since they are under the symlink for
+ /System/Library/WebKit.framework.
+
+ * Configurations/adattributiond.xcconfig:
+ * Configurations/webpushd.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
2022-01-26 Antoine Quint <graouts@webkit.org>
[Model] Mouse interaction for <model> is flipped in the y-axis
diff --git a/Source/WebKit/Configurations/adattributiond.xcconfig b/Source/WebKit/Configurations/adattributiond.xcconfig
index 4f83553..c90841a 100644
--- a/Source/WebKit/Configurations/adattributiond.xcconfig
+++ b/Source/WebKit/Configurations/adattributiond.xcconfig
@@ -36,8 +36,3 @@
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 = $(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);
diff --git a/Source/WebKit/Configurations/webpushd.xcconfig b/Source/WebKit/Configurations/webpushd.xcconfig
index d1b7933..a7f5629 100644
--- a/Source/WebKit/Configurations/webpushd.xcconfig
+++ b/Source/WebKit/Configurations/webpushd.xcconfig
@@ -44,10 +44,4 @@
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 = $(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);
-
SKIP_INSTALL = $(WK_SKIP_INSTALL_WEBPUSHD)
-
diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
index 99bc337..47643b1 100644
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -14121,7 +14121,6 @@
buildPhases = (
517B5F57275A8D3E002DC22D /* Sources */,
517B5F58275A8D3E002DC22D /* Frameworks */,
- 6577FFC32769C8110011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -14164,7 +14163,6 @@
5C1579D227165B2F00ED5280 /* Sources */,
5C1579D427165B2F00ED5280 /* Frameworks */,
5C1579D527165B2F00ED5280 /* Process webpushd Entitlements */,
- 6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -14185,7 +14183,6 @@
5CAF7A9D26F93A750003F19E /* Sources */,
5CAF7A9F26F93A750003F19E /* Frameworks */,
5C1578E6270E129400ED5280 /* Process adattributiond Entitlements */,
- 6577FFC12769C7BB0011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -15075,60 +15072,6 @@
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 = (
- );
- 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 = (
- );
- 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 = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/zsh;
- shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
- };
7A7E8DF22748392500DCC97A /* Process WebContent entitlements */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
