<rdar://problem/12500358> [Cocoa] Development variants of XPC services should not...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Feb 2014 18:44:28 +0000 (18:44 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Feb 2014 18:44:28 +0000 (18:44 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164547 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/BaseXPCService.xcconfig
Source/WebKit2/Configurations/DatabaseService.Development.xcconfig
Source/WebKit2/Configurations/DatabaseService.xcconfig
Source/WebKit2/Configurations/NetworkService.Development.xcconfig
Source/WebKit2/Configurations/NetworkService.xcconfig
Source/WebKit2/Configurations/PluginService.32.xcconfig
Source/WebKit2/Configurations/PluginService.64.xcconfig
Source/WebKit2/Configurations/PluginService.Development.xcconfig
Source/WebKit2/Configurations/WebContentService.Development.xcconfig
Source/WebKit2/Configurations/WebContentService.xcconfig

index f5fd207..ff6545c 100644 (file)
@@ -1,3 +1,24 @@
+2014-02-22  Dan Bernstein  <mitz@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  <bfulgham@apple.com>
 
         Extend media support for WebVTT sources
 2014-02-21  Brent Fulgham  <bfulgham@apple.com>
 
         Extend media support for WebVTT sources
index bc67521..818834e 100644 (file)
 #include "BaseTarget.xcconfig"
 
 GCC_ENABLE_OBJC_GC = NO;
 #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 = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;
index c4fbf61..ad918a8 100644 (file)
@@ -23,5 +23,7 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #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;
 PRODUCT_NAME = com.apple.WebKit.Databases.Development;
 INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/Info.plist;
index a3f189a..ff2c863 100644 (file)
@@ -23,5 +23,7 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #include "BaseXPCService.xcconfig"
 
+WK_XPC_SERVICE_VARIANT = Normal;
+
 PRODUCT_NAME = com.apple.WebKit.Databases;
 INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
 PRODUCT_NAME = com.apple.WebKit.Databases;
 INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
index f1debf7..33d40f5 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #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;
 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;
index 65a3d0e..94aa998 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #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;
 PRODUCT_NAME = com.apple.WebKit.Networking;
 INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
 INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
index afe2a9c..e6fe484 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #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);
 VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
 VALID_ARCHS_macosx = $(VALID_ARCHS_macosx_$(CONFIGURATION));
 VALID_ARCHS_macosx_Debug = $(ARCHS_STANDARD_32_64_BIT);
index 5b6ae26..f409c48 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #include "BaseXPCService.xcconfig"
 
+WK_XPC_SERVICE_VARIANT = Normal;
+
 ARCHS = $(ARCHS_$(PLATFORM_NAME));
 ARCHS_macosx = x86_64;
 ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT);
 ARCHS = $(ARCHS_$(PLATFORM_NAME));
 ARCHS_macosx = x86_64;
 ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT);
index 6567ea1..8a4a17b 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #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;
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.Development;
 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
 
index aa8f592..8536fc7 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #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;
 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;
index a3158ee..4f12222 100644 (file)
@@ -23,6 +23,8 @@
 
 #include "BaseXPCService.xcconfig"
 
 
 #include "BaseXPCService.xcconfig"
 
+WK_XPC_SERVICE_VARIANT = Normal;
+
 PRODUCT_NAME = com.apple.WebKit.WebContent;
 
 INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
 PRODUCT_NAME = com.apple.WebKit.WebContent;
 
 INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));