Diff
Modified: trunk/Source/WebKit2/ChangeLog (164546 => 164547)
--- trunk/Source/WebKit2/ChangeLog 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-22 18:44:28 UTC (rev 164547)
@@ -1,3 +1,24 @@
+2014-02-22 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/12500358> [Cocoa] Development variants of XPC services should not be installed in WebKit2.framework/XPCServices
+ https://bugs.webkit.org/show_bug.cgi?id=129197
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/BaseXPCService.xcconfig: Made INSTALL_PATH vary based on
+ WK_XPC_SERVICE_VARIANT. For the Development variant, use an install path outside the
+ framework. Note that engineering builds using the build action continue to have the
+ Development variants copied into the framework by a script build phase.
+ * Configurations/DatabaseService.Development.xcconfig: Set WK_XPC_SERVICE_VARIANT.
+ * Configurations/DatabaseService.xcconfig: Ditto.
+ * Configurations/NetworkService.Development.xcconfig: Ditto.
+ * Configurations/NetworkService.xcconfig: Ditto.
+ * Configurations/PluginService.32.xcconfig: Ditto.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+ * Configurations/PluginService.Development.xcconfig: Ditto.
+ * Configurations/WebContentService.Development.xcconfig: Ditto.
+ * Configurations/WebContentService.xcconfig: Ditto.
+
2014-02-21 Brent Fulgham <bfulg...@apple.com>
Extend media support for WebVTT sources
Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -24,10 +24,15 @@
#include "BaseTarget.xcconfig"
GCC_ENABLE_OBJC_GC = NO;
-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
-INSTALL_PATH_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
+INSTALL_PATH = $(INSTALL_PATH_$(WK_XPC_SERVICE_VARIANT));
+
+INSTALL_PATH_Normal = $(INSTALL_PATH_Normal_$(PLATFORM_NAME));
+INSTALL_PATH_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
+INSTALL_PATH_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
+
+INSTALL_PATH_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
+
APP_ICON = $(APP_ICON_$(CONFIGURATION));
APP_ICON_Debug = WebKit.icns;
APP_ICON_Release = WebKit.icns;
Modified: trunk/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,5 +23,7 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Development;
+
PRODUCT_NAME = com.apple.WebKit.Databases.Development;
INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/Info.plist;
Modified: trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,5 +23,7 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Normal;
+
PRODUCT_NAME = com.apple.WebKit.Databases;
INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
Modified: trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Development;
+
PRODUCT_NAME = com.apple.WebKit.Networking.Development;
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Normal;
+
PRODUCT_NAME = com.apple.WebKit.Networking;
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Normal;
+
VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
VALID_ARCHS_macosx = $(VALID_ARCHS_macosx_$(CONFIGURATION));
VALID_ARCHS_macosx_Debug = $(ARCHS_STANDARD_32_64_BIT);
Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Normal;
+
ARCHS = $(ARCHS_$(PLATFORM_NAME));
ARCHS_macosx = x86_64;
ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT);
Modified: trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Development;
+
PRODUCT_NAME = com.apple.WebKit.Plugin.Development;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Development;
+
PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (164546 => 164547)
--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-02-22 18:10:37 UTC (rev 164546)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-02-22 18:44:28 UTC (rev 164547)
@@ -23,6 +23,8 @@
#include "BaseXPCService.xcconfig"
+WK_XPC_SERVICE_VARIANT = Normal;
+
PRODUCT_NAME = com.apple.WebKit.WebContent;
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
