Move the WebContentServices to WebProcess/EntryPoint/mac/XPCService/.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2013 23:22:15 +0000 (23:22 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2013 23:22:15 +0000 (23:22 +0000)
Reviewed by Anders Carlsson.

* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/EntryPoint: Added.
* WebProcess/EntryPoint/mac: Added.
* WebProcess/EntryPoint/mac/LegacyProcess: Added.
* WebProcess/EntryPoint/mac/XPCService: Added.
* WebProcess/EntryPoint/mac/XPCService/WebContentService: Copied from WebProcessService.
* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development: Copied from WebProcessServiceForWebKitDevelopment.
* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/WebContentServiceMain.Development.mm: Copied from WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm.
* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/WebProcessServiceForWebKitDevelopmentMain.mm: Removed.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/WebContentServiceMain.mm: Copied from WebProcessService/WebProcessServiceMain.mm.
* WebProcess/EntryPoint/mac/XPCService/WebContentService/WebProcessServiceMain.mm: Removed.
* WebProcessService: Removed.
* WebProcessService/Info.plist: Removed.
* WebProcessService/WebProcessServiceMain.mm: Removed.
* WebProcessServiceForWebKitDevelopment: Removed.
* WebProcessServiceForWebKitDevelopment/Info.plist: Removed.
* WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm: Removed.

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

Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/WebContentService.Development.xcconfig
Source/WebKit2/Configurations/WebContentService.xcconfig
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist [moved from Source/WebKit2/WebProcessServiceForWebKitDevelopment/Info.plist with 100% similarity]
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/WebContentServiceMain.Development.mm [moved from Source/WebKit2/WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm with 100% similarity]
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist [moved from Source/WebKit2/WebProcessService/Info.plist with 100% similarity]
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/WebContentServiceMain.mm [moved from Source/WebKit2/WebProcessService/WebProcessServiceMain.mm with 100% similarity]

index 29dc453..2d3aed3 100644 (file)
@@ -1,3 +1,29 @@
+2013-01-25  Sam Weinig  <sam@webkit.org>
+
+        Move the WebContentServices to WebProcess/EntryPoint/mac/XPCService/.
+
+        Reviewed by Anders Carlsson.
+
+        * Configurations/WebContentService.Development.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/EntryPoint: Added.
+        * WebProcess/EntryPoint/mac: Added.
+        * WebProcess/EntryPoint/mac/LegacyProcess: Added.
+        * WebProcess/EntryPoint/mac/XPCService: Added.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService: Copied from WebProcessService.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development: Copied from WebProcessServiceForWebKitDevelopment.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/WebContentServiceMain.Development.mm: Copied from WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/WebProcessServiceForWebKitDevelopmentMain.mm: Removed.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/WebContentServiceMain.mm: Copied from WebProcessService/WebProcessServiceMain.mm.
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/WebProcessServiceMain.mm: Removed.
+        * WebProcessService: Removed.
+        * WebProcessService/Info.plist: Removed.
+        * WebProcessService/WebProcessServiceMain.mm: Removed.
+        * WebProcessServiceForWebKitDevelopment: Removed.
+        * WebProcessServiceForWebKitDevelopment/Info.plist: Removed.
+        * WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm: Removed.
+
 2013-01-25  Ivan Krstić  <ike@apple.com>
 
         Prepend common plugin sandbox profile to specific per-plugin one.
index 3a9e30d..34251a4 100644 (file)
@@ -24,4 +24,4 @@
 #include "BaseXPCService.xcconfig"
 
 PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
-INFOPLIST_FILE = WebProcessServiceForWebKitDevelopment/Info.plist;
+INFOPLIST_FILE = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist;
index 12e91ce..eec076c 100644 (file)
@@ -24,4 +24,4 @@
 #include "BaseXPCService.xcconfig"
 
 PRODUCT_NAME = com.apple.WebKit.WebContent;
-INFOPLIST_FILE = WebProcessService/Info.plist;
+INFOPLIST_FILE = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist;
index d16ae5d..faf6a48 100644 (file)
                BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
                BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
                BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
+               BCACC44516B24CAA00B6E092 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BCACC44016B24CAA00B6E092 /* Info.plist */; };
+               BCACC44716B24CAA00B6E092 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BCACC44316B24CAA00B6E092 /* Info.plist */; };
+               BCACC44916B24D3200B6E092 /* WebContentServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCACC44116B24CAA00B6E092 /* WebContentServiceMain.mm */; };
+               BCACC44A16B24D3600B6E092 /* WebContentServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCACC44416B24CAA00B6E092 /* WebContentServiceMain.Development.mm */; };
                BCAE9DFB160C0AA100A33217 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
-               BCAE9E05160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */; };
-               BCAE9E07160C139A00A33217 /* WebProcessServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAE9E06160C139A00A33217 /* WebProcessServiceMain.mm */; };
                BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
                BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
                BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC8049D122F0D6B00103529 /* MutableArray.cpp */; };
                BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseXPCService.xcconfig; sourceTree = "<group>"; };
                BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.xcconfig; sourceTree = "<group>"; };
                BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.Development.xcconfig; sourceTree = "<group>"; };
-               BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = com.apple.WebKit.WebContentForDevelopment.xpc; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
-               BCAE9DEF160C097500A33217 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               BCAE9E01160C12DA00A33217 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = WebProcessService/Info.plist; sourceTree = "<group>"; };
-               BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessServiceForWebKitDevelopmentMain.mm; sourceTree = "<group>"; };
-               BCAE9E06160C139A00A33217 /* WebProcessServiceMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebProcessServiceMain.mm; path = WebProcessService/WebProcessServiceMain.mm; sourceTree = "<group>"; };
+               BCACC44016B24CAA00B6E092 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               BCACC44116B24CAA00B6E092 /* WebContentServiceMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentServiceMain.mm; sourceTree = "<group>"; };
+               BCACC44316B24CAA00B6E092 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               BCACC44416B24CAA00B6E092 /* WebContentServiceMain.Development.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentServiceMain.Development.mm; sourceTree = "<group>"; };
+               BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
                BCB0AEE7122F53E300B1341E /* MutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutableDictionary.h; sourceTree = "<group>"; };
                BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutableDictionary.cpp; sourceTree = "<group>"; };
                BCB0B0DB12305A2500B1341E /* WebContextUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextUserMessageCoders.h; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
-                               BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */,
+                               BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */,
                                510CC80E1613C79900D03ED3 /* NetworkProcess.app */,
                                BCDE094213272496001259FB /* PluginProcess.app */,
                                1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
                                E1EDFD9716287AEC0039ECDA /* SharedWorkerProcess */,
                                BC8A500E11765AD400757573 /* WebKit2 */,
                                BC8A500F11765AE300757573 /* WebProcess */,
-                               BC3DE47815A917C6008D26FC /* WebProcessService */,
-                               BCAE9DED160C097400A33217 /* WebProcessServiceForWebKitDevelopment */,
                                6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */,
                                1CBC945D16515ED200D68AAE /* Dock.pdf */,
                                089C1666FE841158C02AAC07 /* InfoPlist.strings */,
                BC032D5C10F436D50058C15A /* WebProcess */ = {
                        isa = PBXGroup;
                        children = (
+                               BCACC43B16B24C5D00B6E092 /* EntryPoint */,
                                512E352A130B559900ABD19A /* ApplicationCache */,
                                3309344B1315B93A0097A7BC /* Cookies */,
                                CD73BA3D131A2A2100EEDED2 /* FullScreen */,
                        tabWidth = 8;
                        usesTabs = 0;
                };
-               BC3DE47815A917C6008D26FC /* WebProcessService */ = {
-                       isa = PBXGroup;
-                       children = (
-                               BCAE9E01160C12DA00A33217 /* Info.plist */,
-                               BCAE9E06160C139A00A33217 /* WebProcessServiceMain.mm */,
-                       );
-                       name = WebProcessService;
-                       sourceTree = "<group>";
-               };
                BC4075D5124FEFFA0068F20A /* cf */ = {
                        isa = PBXGroup;
                        children = (
                        path = mac;
                        sourceTree = "<group>";
                };
-               BCAE9DED160C097400A33217 /* WebProcessServiceForWebKitDevelopment */ = {
+               BCACC43B16B24C5D00B6E092 /* EntryPoint */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BCACC43D16B24C7D00B6E092 /* LegacyProcess */,
+                               BCACC43E16B24C8B00B6E092 /* XPCService */,
+                       );
+                       path = EntryPoint;
+                       sourceTree = "<group>";
+               };
+               BCACC43D16B24C7D00B6E092 /* LegacyProcess */ = {
+                       isa = PBXGroup;
+                       children = (
+                       );
+                       name = LegacyProcess;
+                       path = mac/LegacyProcess;
+                       sourceTree = "<group>";
+               };
+               BCACC43E16B24C8B00B6E092 /* XPCService */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BCACC43F16B24CAA00B6E092 /* WebContentService */,
+                               BCACC44216B24CAA00B6E092 /* WebContentService.Development */,
+                       );
+                       name = XPCService;
+                       path = mac/XPCService;
+                       sourceTree = "<group>";
+               };
+               BCACC43F16B24CAA00B6E092 /* WebContentService */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BCACC44016B24CAA00B6E092 /* Info.plist */,
+                               BCACC44116B24CAA00B6E092 /* WebContentServiceMain.mm */,
+                       );
+                       path = WebContentService;
+                       sourceTree = "<group>";
+               };
+               BCACC44216B24CAA00B6E092 /* WebContentService.Development */ = {
                        isa = PBXGroup;
                        children = (
-                               BCAE9DEF160C097500A33217 /* Info.plist */,
-                               BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */,
+                               BCACC44316B24CAA00B6E092 /* Info.plist */,
+                               BCACC44416B24CAA00B6E092 /* WebContentServiceMain.Development.mm */,
                        );
-                       path = WebProcessServiceForWebKitDevelopment;
+                       path = WebContentService.Development;
                        sourceTree = "<group>";
                };
                BCBAAC58144E38B90053F82F /* WKView Details */ = {
                        );
                        name = WebContent.Development;
                        productName = WebProcessServiceForWebKitDevelopment;
-                       productReference = BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */;
+                       productReference = BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */;
                        productType = "com.apple.product-type.bundle";
                };
                BCDE093313272496001259FB /* PluginProcess */ = {
                                BC9FA523160D4A0F0054DF9A /* com.apple.WebProcess.sb in Resources */,
                                1CBC945E16515ED200D68AAE /* Dock.pdf in Resources */,
                                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+                               BCACC44516B24CAA00B6E092 /* Info.plist in Resources */,
+                               BCACC44716B24CAA00B6E092 /* Info.plist in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               BCAE9E07160C139A00A33217 /* WebProcessServiceMain.mm in Sources */,
+                               BCACC44916B24D3200B6E092 /* WebContentServiceMain.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               BCAE9E05160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm in Sources */,
+                               BCACC44A16B24D3600B6E092 /* WebContentServiceMain.Development.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };