Diff
Modified: trunk/Source/WebKit2/ChangeLog (205458 => 205459)
--- trunk/Source/WebKit2/ChangeLog 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-05 20:54:06 UTC (rev 205459)
@@ -1,3 +1,24 @@
+2016-09-05 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Drop ".Development" suffix from XPC service bundle IDs, leave it only on the executable
+ https://bugs.webkit.org/show_bug.cgi?id=161575
+
+ Reviewed by Sam Weinig.
+
+ Append the ".Development" suffix to the executable names, but not to the bundle names and
+ bundle IDs.
+
+ * Configurations/BaseTarget.xcconfig: No need for a preprocessor definition anymore.
+ * Configurations/BaseXPCService.xcconfig: Set EXECUTABLE_SUFFIX.
+ * Configurations/DatabaseService.xcconfig: No need to suffix the service name and bundle ID.
+ * Configurations/NetworkService.xcconfig: Ditto.
+ * Configurations/PluginService.32.xcconfig: Ditto.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::serviceName): Service names are no longer suffixed.
+ * WebKit2.xcodeproj/project.pbxproj: Ditto.
+
2016-09-05 Gustavo Noronha Silva <gustavo.noro...@collabora.co.uk>
[GTK] GL_PACK_ROW_LENGTH is not available in GLES2
Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -37,7 +37,7 @@
FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
GCC_PREFIX_HEADER = WebKit2Prefix.h;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) WK_XPC_SERVICE_SUFFIX=\"$(WK_XPC_SERVICE_SUFFIX)\" FRAMEWORK_NAME=WebKit;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) FRAMEWORK_NAME=WebKit;
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -27,6 +27,8 @@
VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
VALID_ARCHS_macosx_NO = $(ARCHS_STANDARD);
+EXECUTABLE_SUFFIX = $(WK_XPC_SERVICE_SUFFIX);
+
INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
Modified: trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -25,5 +25,5 @@
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
-PRODUCT_NAME = com.apple.WebKit.Databases$(WK_XPC_SERVICE_SUFFIX);
+PRODUCT_NAME = com.apple.WebKit.Databases;
INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -25,7 +25,7 @@
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Network-iOS;
-PRODUCT_NAME = com.apple.WebKit.Networking$(WK_XPC_SERVICE_SUFFIX);
+PRODUCT_NAME = com.apple.WebKit.Networking;
INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -25,7 +25,7 @@
VALID_ARCHS_macosx_NO = i386;
-PRODUCT_NAME = com.apple.WebKit.Plugin.32$(WK_XPC_SERVICE_SUFFIX);
+PRODUCT_NAME = com.apple.WebKit.Plugin.32;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -25,7 +25,7 @@
VALID_ARCHS_macosx_NO = x86_64;
-PRODUCT_NAME = com.apple.WebKit.Plugin.64$(WK_XPC_SERVICE_SUFFIX);
+PRODUCT_NAME = com.apple.WebKit.Plugin.64;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (205458 => 205459)
--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2016-09-05 20:54:06 UTC (rev 205459)
@@ -29,7 +29,7 @@
CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_YES = Configurations/WebContent-OSX.entitlements;
OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = $(WK_XPC_DOMAIN_EXTENSION_CODE_SIGN_FLAGS);
-PRODUCT_NAME = com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX);
+PRODUCT_NAME = com.apple.WebKit.WebContent;
INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX$(WK_XPC_SERVICE_INFOPLIST_SUFFIX).plist;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (205458 => 205459)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-09-05 20:54:06 UTC (rev 205459)
@@ -52,18 +52,18 @@
{
switch (launchOptions.processType) {
case ProcessLauncher::ProcessType::Web:
- return "com.apple.WebKit.WebContent" WK_XPC_SERVICE_SUFFIX;
+ return "com.apple.WebKit.WebContent";
case ProcessLauncher::ProcessType::Network:
- return "com.apple.WebKit.Networking" WK_XPC_SERVICE_SUFFIX;
+ return "com.apple.WebKit.Networking";
#if ENABLE(DATABASE_PROCESS)
case ProcessLauncher::ProcessType::Database:
- return "com.apple.WebKit.Databases" WK_XPC_SERVICE_SUFFIX;
+ return "com.apple.WebKit.Databases";
#endif
#if ENABLE(NETSCAPE_PLUGIN_API)
case ProcessLauncher::ProcessType::Plugin32:
- return "com.apple.WebKit.Plugin.32" WK_XPC_SERVICE_SUFFIX;
+ return "com.apple.WebKit.Plugin.32";
case ProcessLauncher::ProcessType::Plugin64:
- return "com.apple.WebKit.Plugin.64" WK_XPC_SERVICE_SUFFIX;
+ return "com.apple.WebKit.Plugin.64";
#endif
}
}
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (205458 => 205459)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-09-05 17:25:52 UTC (rev 205458)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-09-05 20:54:06 UTC (rev 205459)
@@ -3095,7 +3095,7 @@
51E949961D761CC700EC9EB9 /* UIGamepadProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderIOS.mm; sourceTree = "<group>"; };
51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoaderMessageReceiver.cpp; sourceTree = "<group>"; };
51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
- 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Databases.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Databases.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleDOMWindowExtension.h; sourceTree = "<group>"; };
51FA2D5A15211A1E00C1BA0B /* InjectedBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleDOMWindowExtension.h; sourceTree = "<group>"; };
51FA2D5C15211A5000C1BA0B /* InjectedBundleDOMWindowExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleDOMWindowExtension.cpp; sourceTree = "<group>"; };
@@ -3555,7 +3555,7 @@
BC33E0D012408E8600360F3F /* InjectedBundleRangeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleRangeHandle.cpp; sourceTree = "<group>"; };
BC39C4331626366F008BC689 /* WKDOMRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMRange.mm; sourceTree = "<group>"; };
BC39C4341626366F008BC689 /* WKDOMRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMRange.h; sourceTree = "<group>"; };
- BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.WebContent.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BC3DE46815A91763008D26FC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
BC4075D7124FF0270068F20A /* WKArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKArray.cpp; sourceTree = "<group>"; };
BC4075D8124FF0270068F20A /* WKArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKArray.h; sourceTree = "<group>"; };
@@ -3661,12 +3661,12 @@
BC8283A316B4BD9100A278FE /* Info-OSX.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkServiceEntryPoint.mm; sourceTree = "<group>"; };
BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.xcconfig; sourceTree = "<group>"; };
- BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Networking.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Networking.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginServiceEntryPoint.mm; sourceTree = "<group>"; };
BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.32.xcconfig; sourceTree = "<group>"; };
BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.xcconfig; sourceTree = "<group>"; };
- BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
- BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPreferencesMac.mm; sourceTree = "<group>"; };
@@ -4094,11 +4094,11 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */,
- BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.Development.xpc */,
- BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */,
- BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.Development.xpc */,
- BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.Development.xpc */,
+ 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
+ BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
+ BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */,
+ BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */,
+ BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
8DC2EF5B0486A6940098B216 /* WebKit.framework */,
@@ -8441,7 +8441,7 @@
);
name = Databases;
productName = Networking;
- productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */;
+ productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */;
productType = "com.apple.product-type.xpc-service";
};
8DC2EF4F0486A6940098B216 /* WebKit */ = {
@@ -8498,7 +8498,7 @@
);
name = WebContent;
productName = WebKit2Service;
- productReference = BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.Development.xpc */;
+ productReference = BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */;
productType = "com.apple.product-type.xpc-service";
};
BC8283B016B4BF7700A278FE /* Networking */ = {
@@ -8516,7 +8516,7 @@
);
name = Networking;
productName = Networking;
- productReference = BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.Development.xpc */;
+ productReference = BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */;
productType = "com.apple.product-type.xpc-service";
};
BC8283F816B4FDDE00A278FE /* Plugin.32 */ = {
@@ -8534,7 +8534,7 @@
);
name = Plugin.32;
productName = Plugin.32;
- productReference = BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */;
+ productReference = BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */;
productType = "com.apple.product-type.xpc-service";
};
BC82841E16B4FDF600A278FE /* Plugin.64 */ = {
@@ -8552,7 +8552,7 @@
);
name = Plugin.64;
productName = Plugin.64;
- productReference = BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.Development.xpc */;
+ productReference = BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */;
productType = "com.apple.product-type.xpc-service";
};
CDC382FB17211799008A2FC3 /* WebProcessShim */ = {
@@ -8901,23 +8901,23 @@
files = (
);
inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(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)/com.apple.WebKit.Databases.xpc",
);
name = "Copy XPC services for engineering builds";
outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64$(WK_XPC_SERVICE_SUFFIX).xpc",
- "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases$(WK_XPC_SERVICE_SUFFIX).xpc",
+ "$(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/com.apple.WebKit.Databases.xpc",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${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${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent${WK_XPC_SERVICE_SUFFIX}.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking${WK_XPC_SERVICE_SUFFIX}.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases${WK_XPC_SERVICE_SUFFIX}.xpc\&q
uot;\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32${WK_XPC_SERVICE_SUFFIX}.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64${WK_XPC_SERVICE_SUFFIX}.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64${WK_XPC_SERVICE_SUFFIX}.xpc\"\nfi\n";
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${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}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERV
ICES_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;
