Modified: trunk/Source/WebKit/ChangeLog (242685 => 242686)
--- trunk/Source/WebKit/ChangeLog 2019-03-10 05:52:26 UTC (rev 242685)
+++ trunk/Source/WebKit/ChangeLog 2019-03-10 17:13:52 UTC (rev 242686)
@@ -1,3 +1,13 @@
+2019-03-09 Darin Adler <[email protected]>
+
+ [Cocoa] Code signing fails because services are copied into XPCServices after the framework is signed
+ https://bugs.webkit.org/show_bug.cgi?id=195523
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj: Make symbolic links while building the WebKit
+ framework instead of copying in the services after the framework is built.
+
2019-03-09 Wenson Hsieh <[email protected]>
REGRESSION (r242551): Sporadic hangs when tapping to change selection on iOS
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (242685 => 242686)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-03-10 05:52:26 UTC (rev 242685)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-03-10 17:13:52 UTC (rev 242686)
@@ -12,7 +12,6 @@
buildConfigurationList = 1A50DB48110A3C27000D3FE5 /* Build configuration list for PBXAggregateTarget "All" */;
buildPhases = (
BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */,
- BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
);
dependencies = (
BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */,
@@ -10119,6 +10118,7 @@
A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */,
5379C7AC21E5288500E4A8F6 /* Check .xcfilelists */,
+ 933170072234674500B32554 /* Create symlinks to XPC services for engineering builds */,
);
buildRules = (
);
@@ -10656,6 +10656,24 @@
shellPath = /bin/sh;
shellScript = "Scripts/process-entitlements.sh\n";
};
+ 933170072234674500B32554 /* Create symlinks to XPC services for engineering builds */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "Create symlinks to XPC services for engineering builds";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\n BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES=\"../..\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\n BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES=\"../../../..\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/
${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\" \"${XPC_SERVICES_PATH}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\"\n\nif [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n ln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";
+ };
99CA3862207286DB00BAD578 /* Copy WebDriver Atoms to Framework Private Headers */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -10706,32 +10724,6 @@
shellPath = /bin/sh;
shellScript = "if [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n ln -sf \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n";
};
- BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/$(WK_STORAGE_SERVICE_PRODUCT_NAME).xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent.Development.xpc",
- );
- name = "Copy XPC services for engineering builds";
- outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/$(WK_STORAGE_SERVICE_PRODUCT_NAME).xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\" \"${XPC_SERVICES_PATH}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\"\n\nif [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_S
ERVICES_PATH}/com.apple.WebKit.Plugin.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";
- };
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
