Title: [288633] branches/safari-613.1.14.5-branch/Source/WebKit
- Revision
- 288633
- Author
- repst...@apple.com
- Date
- 2022-01-26 11:24:02 -0800 (Wed, 26 Jan 2022)
Log Message
Cherry-pick r288629. rdar://problem/88061283
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: https://svn.webkit.org/repository/webkit/trunk@288629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog (288632 => 288633)
--- branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-01-26 19:22:04 UTC (rev 288632)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/ChangeLog 2022-01-26 19:24:02 UTC (rev 288633)
@@ -1,3 +1,35 @@
+2022-01-26 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r288629. rdar://problem/88061283
+
+ 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: https://svn.webkit.org/repository/webkit/trunk@288629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-26 Michael Saboff <msab...@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-25 Russell Epstein <repst...@apple.com>
Cherry-pick r288593. rdar://problem/87906922
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig (288632 => 288633)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 19:22:04 UTC (rev 288632)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 19:24:02 UTC (rev 288633)
@@ -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);
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig (288632 => 288633)
--- branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 19:22:04 UTC (rev 288632)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 19:24:02 UTC (rev 288633)
@@ -43,8 +43,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);
Modified: branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288632 => 288633)
--- branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 19:22:04 UTC (rev 288632)
+++ branches/safari-613.1.14.5-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 19:24:02 UTC (rev 288633)
@@ -14075,7 +14075,6 @@
buildPhases = (
517B5F57275A8D3E002DC22D /* Sources */,
517B5F58275A8D3E002DC22D /* Frameworks */,
- 6577FFC32769C8110011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -14118,7 +14117,6 @@
5C1579D227165B2F00ED5280 /* Sources */,
5C1579D427165B2F00ED5280 /* Frameworks */,
5C1579D527165B2F00ED5280 /* Process webpushd Entitlements */,
- 6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -14139,7 +14137,6 @@
5CAF7A9D26F93A750003F19E /* Sources */,
5CAF7A9F26F93A750003F19E /* Frameworks */,
5C1578E6270E129400ED5280 /* Process adattributiond Entitlements */,
- 6577FFC12769C7BB0011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -15028,60 +15025,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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
