Modified: branches/safari-613.1.14.1-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288230 => 288231)
--- branches/safari-613.1.14.1-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-19 20:23:22 UTC (rev 288230)
+++ branches/safari-613.1.14.1-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-19 20:26:04 UTC (rev 288231)
@@ -14,8 +14,6 @@
BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */,
);
dependencies = (
- 517B5F6D275B07C3002DC22D /* PBXTargetDependency */,
- 5C1579DF27165E0800ED5280 /* PBXTargetDependency */,
5CAF7AA926F93F9F0003F19E /* PBXTargetDependency */,
5742A2FA2535619D00B7BA14 /* PBXTargetDependency */,
BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */,
@@ -991,10 +989,7 @@
517A530F1F47A86200DCDC0A /* WebSWClientConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A530E1F47A84300DCDC0A /* WebSWClientConnectionMessageReceiver.cpp */; };
517A53101F47A86200DCDC0A /* WebSWClientConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A530D1F47A84300DCDC0A /* WebSWClientConnectionMessages.h */; };
517B5F2E2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F2D2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h */; };
- 517B5F65275A8D7F002DC22D /* WebPushToolMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F64275A8D7E002DC22D /* WebPushToolMain.mm */; };
- 517B5F68275A9A78002DC22D /* WebPushToolConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F67275A9A78002DC22D /* WebPushToolConnection.mm */; };
517B5F73275E9609002DC22D /* WebPushDaemonMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F72275E9609002DC22D /* WebPushDaemonMain.h */; };
- 517B5F78275E9795002DC22D /* webpushd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F77275E9795002DC22D /* webpushd.cpp */; };
517B5F79275E97A1002DC22D /* WebPushDaemonMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C157A0B2717CA1C00ED5280 /* WebPushDaemonMain.mm */; };
517B5F7A275E97A4002DC22D /* WebPushDaemon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 512CD69E2723393A00F7F8EC /* WebPushDaemon.mm */; };
517B5F7B275E97A9002DC22D /* PushClientConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB7A2744C50700C45A72 /* PushClientConnection.mm */; };
@@ -1011,8 +1006,6 @@
517B5F95275EBA63002DC22D /* PushMessageForTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F94275EBA62002DC22D /* PushMessageForTesting.h */; };
517B5F97275EC5E5002DC22D /* WebPushMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F96275EC5E5002DC22D /* WebPushMessage.h */; };
517B5F99275EC601002DC22D /* WebPushMessageCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F98275EC600002DC22D /* WebPushMessageCocoa.mm */; };
- 517B5F9B275F3A98002DC22D /* DaemonUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C1579F92717AF5000ED5280 /* DaemonUtilities.mm */; };
- 517B5F9C275F3C37002DC22D /* DaemonEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1579E827172A8A00ED5280 /* DaemonEncoder.cpp */; };
517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; };
517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
@@ -1204,7 +1197,6 @@
5C1579EF27172A8B00ED5280 /* DaemonDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1579EB27172A8B00ED5280 /* DaemonDecoder.h */; };
5C19A5201FD0B29500EEA323 /* URLSchemeTaskParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C19A51F1FD0B14700EEA323 /* URLSchemeTaskParameters.h */; };
5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
- 5C20F679276A6DB6006CAC22 /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
5C26958520043212005C439B /* WKOpenPanelParametersPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C26958420042F12005C439B /* WKOpenPanelParametersPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */; };
5C2D5748257FFA4B00679A72 /* WKContextDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C2D5747257FFA1200679A72 /* WKContextDownloadClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2106,27 +2098,6 @@
remoteGlobalIDString = C0CE72851247E66800BC0EC4;
remoteInfo = "Derived Sources";
};
- 517B5F6C275B07C3002DC22D /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 517B5F5A275A8D3E002DC22D;
- remoteInfo = webpushtool;
- };
- 519797C627627B1D00BE0F83 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = E1AC2E2720F7B94C00B0897D;
- remoteInfo = "Unlock Keychain";
- };
- 519797C827627B2300BE0F83 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
5742A2E72535613F00B7BA14 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -2148,20 +2119,6 @@
remoteGlobalIDString = 5742A2E52535613F00B7BA14;
remoteInfo = WebAuthentication;
};
- 5C1579D027165B2F00ED5280 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = E1AC2E2720F7B94C00B0897D;
- remoteInfo = "Unlock Keychain";
- };
- 5C1579DE27165E0800ED5280 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 5C1579CC27165B2F00ED5280;
- remoteInfo = webpushd;
- };
5CAF7A9B26F93A750003F19E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -2260,13 +2217,6 @@
remoteGlobalIDString = CD95493426159004008372D9;
remoteInfo = WebKitSwift;
};
- DFBD8A3B2718B38C00BEC5B0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = WebKit;
- };
DFEE369926FAD112007C78E0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -4390,7 +4340,6 @@
517A530D1F47A84300DCDC0A /* WebSWClientConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSWClientConnectionMessages.h; path = DerivedSources/WebKit/WebSWClientConnectionMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
517A530E1F47A84300DCDC0A /* WebSWClientConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSWClientConnectionMessageReceiver.cpp; path = DerivedSources/WebKit/WebSWClientConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
517B5F2D2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPushDaemonConnectionConfiguration.h; sourceTree = "<group>"; };
- 517B5F5B275A8D3E002DC22D /* webpushtool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = webpushtool; sourceTree = BUILT_PRODUCTS_DIR; };
517B5F64275A8D7E002DC22D /* WebPushToolMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPushToolMain.mm; sourceTree = "<group>"; };
517B5F66275A9A78002DC22D /* WebPushToolConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPushToolConnection.h; sourceTree = "<group>"; };
517B5F67275A9A78002DC22D /* WebPushToolConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPushToolConnection.mm; sourceTree = "<group>"; };
@@ -4763,7 +4712,6 @@
5C1427151C23F8B000D41183 /* LegacyCustomProtocolManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LegacyCustomProtocolManager.messages.in; sourceTree = "<group>"; };
5C14271B1C23F8CC00D41183 /* LegacyCustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyCustomProtocolManagerCocoa.mm; sourceTree = "<group>"; };
5C1578E5270E0DBC00ED5280 /* com.apple.WebKit.adattributiond.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.adattributiond.sb; sourceTree = "<group>"; };
- 5C1579DA27165B2F00ED5280 /* webpushd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = webpushd; sourceTree = BUILT_PRODUCTS_DIR; };
5C1579DD27165BE500ED5280 /* webpushd.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = webpushd.xcconfig; sourceTree = "<group>"; };
5C1579E227172A4900ED5280 /* DaemonConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DaemonConnection.cpp; sourceTree = "<group>"; };
5C1579E327172A4900ED5280 /* DaemonConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaemonConnection.h; sourceTree = "<group>"; };
@@ -6480,13 +6428,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 517B5F58275A8D3E002DC22D /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
5742A2ED2535613F00B7BA14 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -6496,13 +6437,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 5C1579D427165B2F00ED5280 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
5CAF7A9F26F93A750003F19E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -6571,8 +6505,6 @@
isa = PBXGroup;
children = (
5CAF7AA426F93A750003F19E /* adattributiond */,
- 5C1579DA27165B2F00ED5280 /* webpushd */,
- 517B5F5B275A8D3E002DC22D /* webpushtool */,
2D9FB228237523830049F936 /* com.apple.WebKit.GPU.xpc */,
BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
5742A2F72535613F00B7BA14 /* com.apple.WebKit.WebAuthn.xpc */,
@@ -12550,13 +12482,6 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
- 5C1579D127165B2F00ED5280 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
5CAF7A9C26F93A750003F19E /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -14069,25 +13994,6 @@
productReference = 372EBB462017E64300085064 /* com.apple.WebKit.WebContent.Development.xpc */;
productType = "com.apple.product-type.xpc-service";
};
- 517B5F5A275A8D3E002DC22D /* webpushtool */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 517B5F62275A8D3E002DC22D /* Build configuration list for PBXNativeTarget "webpushtool" */;
- buildPhases = (
- 517B5F57275A8D3E002DC22D /* Sources */,
- 517B5F58275A8D3E002DC22D /* Frameworks */,
- 6577FFC32769C8110011AEC8 /* Create Symlink to Alt Root Path */,
- );
- buildRules = (
- );
- dependencies = (
- 519797C927627B2300BE0F83 /* PBXTargetDependency */,
- 519797C727627B1D00BE0F83 /* PBXTargetDependency */,
- );
- name = webpushtool;
- productName = webpushtool;
- productReference = 517B5F5B275A8D3E002DC22D /* webpushtool */;
- productType = "com.apple.product-type.tool";
- };
5742A2E52535613F00B7BA14 /* WebAuthn */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5742A2F32535613F00B7BA14 /* Build configuration list for PBXNativeTarget "WebAuthn" */;
@@ -14110,27 +14016,6 @@
productReference = 5742A2F72535613F00B7BA14 /* com.apple.WebKit.WebAuthn.xpc */;
productType = "com.apple.product-type.xpc-service";
};
- 5C1579CC27165B2F00ED5280 /* webpushd */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 5C1579D627165B2F00ED5280 /* Build configuration list for PBXNativeTarget "webpushd" */;
- buildPhases = (
- 5C1579D127165B2F00ED5280 /* Headers */,
- 5C1579D227165B2F00ED5280 /* Sources */,
- 5C1579D427165B2F00ED5280 /* Frameworks */,
- 5C1579D527165B2F00ED5280 /* Process webpushd Entitlements */,
- 6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */,
- );
- buildRules = (
- );
- dependencies = (
- DFBD8A3C2718B38C00BEC5B0 /* PBXTargetDependency */,
- 5C1579CF27165B2F00ED5280 /* PBXTargetDependency */,
- );
- name = webpushd;
- productName = PluginProcessShim;
- productReference = 5C1579DA27165B2F00ED5280 /* webpushd */;
- productType = "com.apple.product-type.tool";
- };
5CAF7A9926F93A750003F19E /* adattributiond */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "adattributiond" */;
@@ -14314,9 +14199,6 @@
LastSwiftUpdateCheck = 1300;
LastUpgradeCheck = 1140;
TargetAttributes = {
- 517B5F5A275A8D3E002DC22D = {
- CreatedOnToolsVersion = 13.0;
- };
5325BDCD21DFF47700A0DEE1 = {
CreatedOnToolsVersion = 10.1;
ProvisioningStyle = Automatic;
@@ -14373,8 +14255,6 @@
5325BDCD21DFF47700A0DEE1 /* Apply Configuration to XCFileLists */,
942DB232257EE6D4009BD80A /* EmptyDSTROOT */,
5CAF7A9926F93A750003F19E /* adattributiond */,
- 5C1579CC27165B2F00ED5280 /* webpushd */,
- 517B5F5A275A8D3E002DC22D /* webpushtool */,
);
};
/* End PBXProject section */
@@ -14731,7 +14611,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"YES\" ]]; then\n exit\nfi\n\n# If we move the Mac Daemons path to WebKit.framework/Versions/A/Daemons,\n# in addition to a Mac-specific plists, the Mac paths below have to be updated as well.\nif [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n DAEMONS_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Daemons\"\n BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS=\"../..\"\nelse\n DAEMONS_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Daemons\"\n BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS=\"../..\"\nfi\n\nmkdir -p \"${DAEMONS_PATH}\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS}/webpushd\" \"${DAEMONS_PATH}/webpushd\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS}/adattributiond\" \"${DAEMONS_PATH}/adattributiond\"\n";
+ shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"YES\" ]]; then\n exit\nfi\n\n# If we move the Mac Daemons path to WebKit.framework/Versions/A/Daemons,\n# in addition to a Mac-specific plists, the Mac paths below have to be updated as well.\nif [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n DAEMONS_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Daemons\"\n BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS=\"../..\"\nelse\n DAEMONS_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Daemons\"\n BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS=\"../..\"\nfi\n\nmkdir -p \"${DAEMONS_PATH}\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_DAEMONS}/adattributiond\" \"${DAEMONS_PATH}/adattributiond\"\n";
};
5325BDD221DFF47C00A0DEE1 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -14818,26 +14698,6 @@
shellPath = /bin/sh;
shellScript = "Scripts/process-entitlements.sh\n";
};
- 5C1579D527165B2F00ED5280 /* Process webpushd Entitlements */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- "$(SRCROOT)/Scripts/process-entitlements.sh",
- );
- name = "Process webpushd Entitlements";
- outputFileListPaths = (
- );
- outputPaths = (
- "$(WK_PROCESSED_XCENT_FILE)",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "Scripts/process-entitlements.sh\n";
- };
5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -15054,44 +14914,6 @@
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 = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
- );
- 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 = (
- "${OUTPUT_ALTERNATE_ROOT_PATH}",
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/zsh;
- shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
- };
7A7E8DF22748392500DCC97A /* Process WebContent entitlements */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -15257,8 +15079,6 @@
);
inputPaths = (
"$(SRCROOT)/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist",
- "$(SRCROOT)/webpushd/com.apple.webkit.webpushd.ios.plist",
- "$(SRCROOT)/webpushd/com.apple.webkit.webpushd.mac.plist",
);
name = "Copy Daemon Plists";
outputFileListPaths = (
@@ -15265,12 +15085,10 @@
);
outputPaths = (
"$(DSTROOT)/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist",
- "$(DSTROOT)/System/Library/LaunchDaemons/com.apple.webkit.webpushd.plist",
- "$(DSTROOT)/System/Library/LaunchAgents/com.apple.webkit.webpushd.plist",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n ADATTRIBUTIOND_PLIST_SOURCE=\"${SRCROOT}/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist\"\n ADATTRIBUTIOND_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist\"\n echo \"copying adattributiond plist\"\n echo plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\nelse\n echo \"not copying adattributiond plist\"\nfi\n\nif [[ \"${WK_PLATFORM_NAME}\" == iphoneos || \"${WK_PLATFORM_NAME}\" == macosx ]]; then\n if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n WEBPUSHD_PLIST_SOURCE=\"${SRCROOT}/webpushd/com.apple.webkit.webp
ushd.ios.plist\"\n WEBPUSHD_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.webpushd.plist\"\n else\n WEBPUSHD_PLIST_SOURCE=\"${SRCROOT}/webpushd/com.apple.webkit.webpushd.mac.plist\"\n WEBPUSHD_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchAgents/com.apple.webkit.webpushd.plist\"\n fi\n\n echo \"copying webpushd plist\"\n echo plutil -convert binary1 -o \"${WEBPUSHD_PLIST_DESTINATION}\" \"${WEBPUSHD_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${WEBPUSHD_PLIST_DESTINATION}\" \"${WEBPUSHD_PLIST_SOURCE}\"\nelse\n echo \"not copying webpushd plist\"\nfi\n";
+ shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n ADATTRIBUTIOND_PLIST_SOURCE=\"${SRCROOT}/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist\"\n ADATTRIBUTIOND_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist\"\n echo \"copying adattributiond plist\"\n echo plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\nelse\n echo \"not copying adattributiond plist\"\nfi\n";
};
E1AC2E2C20F7B95800B0897D /* Unlock Keychain */ = {
isa = PBXShellScriptBuildPhase;
@@ -15339,18 +15157,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 517B5F57275A8D3E002DC22D /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 5C20F679276A6DB6006CAC22 /* ArgumentCoders.cpp in Sources */,
- 517B5F9C275F3C37002DC22D /* DaemonEncoder.cpp in Sources */,
- 517B5F9B275F3A98002DC22D /* DaemonUtilities.mm in Sources */,
- 517B5F68275A9A78002DC22D /* WebPushToolConnection.mm in Sources */,
- 517B5F65275A8D7F002DC22D /* WebPushToolMain.mm in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
5742A2EA2535613F00B7BA14 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -15360,14 +15166,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 5C1579D227165B2F00ED5280 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 517B5F78275E9795002DC22D /* webpushd.cpp in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
5CAF7A9D26F93A750003F19E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -15882,21 +15680,6 @@
target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
targetProxy = 37F7407812721F740093869B /* PBXContainerItemProxy */;
};
- 517B5F6D275B07C3002DC22D /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 517B5F5A275A8D3E002DC22D /* webpushtool */;
- targetProxy = 517B5F6C275B07C3002DC22D /* PBXContainerItemProxy */;
- };
- 519797C727627B1D00BE0F83 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
- targetProxy = 519797C627627B1D00BE0F83 /* PBXContainerItemProxy */;
- };
- 519797C927627B2300BE0F83 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = 519797C827627B2300BE0F83 /* PBXContainerItemProxy */;
- };
5742A2E62535613F00B7BA14 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
@@ -15912,16 +15695,6 @@
target = 5742A2E52535613F00B7BA14 /* WebAuthn */;
targetProxy = 5742A2F92535619D00B7BA14 /* PBXContainerItemProxy */;
};
- 5C1579CF27165B2F00ED5280 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
- targetProxy = 5C1579D027165B2F00ED5280 /* PBXContainerItemProxy */;
- };
- 5C1579DF27165E0800ED5280 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 5C1579CC27165B2F00ED5280 /* webpushd */;
- targetProxy = 5C1579DE27165E0800ED5280 /* PBXContainerItemProxy */;
- };
5CAF7A9A26F93A750003F19E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
@@ -15992,11 +15765,6 @@
target = CD95493426159004008372D9 /* WebKitSwift */;
targetProxy = CD0C36DC2639D3B4004E35D8 /* PBXContainerItemProxy */;
};
- DFBD8A3C2718B38C00BEC5B0 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 8DC2EF4F0486A6940098B216 /* WebKit */;
- targetProxy = DFBD8A3B2718B38C00BEC5B0 /* PBXContainerItemProxy */;
- };
DFEE369A26FAD112007C78E0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* WebKit */;
@@ -16146,27 +15914,6 @@
};
name = Production;
};
- 517B5F5F275A8D3E002DC22D /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 517B5F6A275AA199002DC22D /* webpushtool.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- 517B5F60275A8D3E002DC22D /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 517B5F6A275AA199002DC22D /* webpushtool.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- 517B5F61275A8D3E002DC22D /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 517B5F6A275AA199002DC22D /* webpushtool.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
5325BDCE21DFF47800A0DEE1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
@@ -16215,33 +15962,6 @@
};
name = Production;
};
- 5C1579D727165B2F00ED5280 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 5C1579DD27165BE500ED5280 /* webpushd.xcconfig */;
- buildSettings = {
- OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- 5C1579D827165B2F00ED5280 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 5C1579DD27165BE500ED5280 /* webpushd.xcconfig */;
- buildSettings = {
- OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
- 5C1579D927165B2F00ED5280 /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 5C1579DD27165BE500ED5280 /* webpushd.xcconfig */;
- buildSettings = {
- OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Production;
- };
5CAF7AA126F93A750003F19E /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */;
@@ -16581,16 +16301,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- 517B5F62275A8D3E002DC22D /* Build configuration list for PBXNativeTarget "webpushtool" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 517B5F5F275A8D3E002DC22D /* Debug */,
- 517B5F60275A8D3E002DC22D /* Release */,
- 517B5F61275A8D3E002DC22D /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
5325BDD121DFF47800A0DEE1 /* Build configuration list for PBXAggregateTarget "Apply Configuration to XCFileLists" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -16611,16 +16321,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- 5C1579D627165B2F00ED5280 /* Build configuration list for PBXNativeTarget "webpushd" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 5C1579D727165B2F00ED5280 /* Debug */,
- 5C1579D827165B2F00ED5280 /* Release */,
- 5C1579D927165B2F00ED5280 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "adattributiond" */ = {
isa = XCConfigurationList;
buildConfigurations = (
