Move XPCService entry points from mac directory to new Cocoa directory
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2019 23:32:42 +0000 (23:32 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2019 23:32:42 +0000 (23:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194129

Reviewed by Chris Dumez.

* Configurations/NetworkService.xcconfig:
* Configurations/PluginService.64.xcconfig:
* Configurations/WebContentService.xcconfig:
* NetworkProcess/EntryPoint/Cocoa: Copied from Source/WebKit/NetworkProcess/EntryPoint/mac.
* NetworkProcess/EntryPoint/mac: Removed.
* PluginProcess/EntryPoint/Cocoa: Copied from Source/WebKit/PluginProcess/EntryPoint/mac.
* PluginProcess/EntryPoint/mac: Removed.
* Shared/EntryPointUtilities/Cocoa: Copied from Source/WebKit/Shared/EntryPointUtilities/mac.
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:
* Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
* Shared/EntryPointUtilities/mac: Removed.
* SourcesCocoa.txt:
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/EntryPoint/Cocoa: Copied from Source/WebKit/WebProcess/EntryPoint/mac.
* WebProcess/EntryPoint/mac: Removed.

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

17 files changed:
Source/WebKit/ChangeLog
Source/WebKit/Configurations/NetworkService.xcconfig
Source/WebKit/Configurations/PluginService.64.xcconfig
Source/WebKit/Configurations/WebContentService.xcconfig
Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist [moved from Source/WebKit/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist with 100% similarity]
Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist [moved from Source/WebKit/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist with 100% similarity]
Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm [moved from Source/WebKit/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm with 100% similarity]
Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist [moved from Source/WebKit/PluginProcess/EntryPoint/mac/XPCService/PluginService.64.Info.plist with 100% similarity]
Source/WebKit/PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm [moved from Source/WebKit/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm with 100% similarity]
Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h [moved from Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h with 100% similarity]
Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm [moved from Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm with 100% similarity]
Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm [moved from Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm with 100% similarity]
Source/WebKit/SourcesCocoa.txt
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist [moved from Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist with 100% similarity]
Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist [moved from Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist with 100% similarity]
Source/WebKit/WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm [moved from Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm with 100% similarity]

index b743a8c..423a4df 100644 (file)
@@ -1,3 +1,27 @@
+2019-02-01  Alex Christensen  <achristensen@webkit.org>
+
+        Move XPCService entry points from mac directory to new Cocoa directory
+        https://bugs.webkit.org/show_bug.cgi?id=194129
+
+        Reviewed by Chris Dumez.
+
+        * Configurations/NetworkService.xcconfig:
+        * Configurations/PluginService.64.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+        * NetworkProcess/EntryPoint/Cocoa: Copied from Source/WebKit/NetworkProcess/EntryPoint/mac.
+        * NetworkProcess/EntryPoint/mac: Removed.
+        * PluginProcess/EntryPoint/Cocoa: Copied from Source/WebKit/PluginProcess/EntryPoint/mac.
+        * PluginProcess/EntryPoint/mac: Removed.
+        * Shared/EntryPointUtilities/Cocoa: Copied from Source/WebKit/Shared/EntryPointUtilities/mac.
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+        * Shared/EntryPointUtilities/mac: Removed.
+        * SourcesCocoa.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/EntryPoint/Cocoa: Copied from Source/WebKit/WebProcess/EntryPoint/mac.
+        * WebProcess/EntryPoint/mac: Removed.
+
 2019-02-01  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS] Consistent 1 sec hang when triggering modal alerts while handling synchronous touch events
index 69bde3f..d06714a 100644 (file)
@@ -37,8 +37,8 @@ OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
 
 PRODUCT_NAME = com.apple.WebKit.Networking;
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
+INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist;
 
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
 OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
index 6794ae4..bac6c46 100644 (file)
@@ -27,7 +27,7 @@ VALID_ARCHS_macosx_NO = x86_64;
 
 PRODUCT_NAME = com.apple.WebKit.Plugin.64;
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.64.Info.plist;
+INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist;
 
 WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
index 9bc3d79..f73cb5d 100644 (file)
@@ -41,8 +41,8 @@ PRODUCT_NAME_Normal = com.apple.WebKit.WebContent;
 PRODUCT_NAME_Development = com.apple.WebKit.WebContent.Development;
 
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
-INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
+INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist;
 
 WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
index 1cf8249..7498bad 100644 (file)
@@ -39,7 +39,7 @@ NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
 
 NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
 
-NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
+NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
 
 NetworkProcess/ios/NetworkProcessIOS.mm
 
@@ -81,7 +81,7 @@ Platform/mac/StringUtilities.mm
 
 Platform/unix/EnvironmentUtilities.cpp
 
-PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm @no-unify
+PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm @no-unify
 
 PluginProcess/mac/PluginControllerProxyMac.mm @no-unify
 PluginProcess/mac/PluginProcessMac.mm @no-unify
@@ -147,8 +147,8 @@ Shared/Cocoa/WKNSURLExtras.mm
 Shared/Cocoa/WKNSURLRequest.mm
 Shared/Cocoa/WKObject.mm
 
-Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
-Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
+Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
+Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
 
 Shared/ios/AuxiliaryProcessIOS.mm
 Shared/ios/InteractionInformationAtPosition.mm
@@ -493,7 +493,7 @@ WebProcess/cocoa/UserMediaCaptureManager.cpp
 WebProcess/cocoa/VideoFullscreenManager.mm
 WebProcess/cocoa/WebProcessCocoa.mm
 
-WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
+WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm
 
 WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
 
index 0ef8bb0..851b5e6 100644 (file)
                                BC82839616B47EC400A278FE /* XPCServiceMain.mm */,
                        );
                        name = XPCService;
-                       path = mac/XPCService;
+                       path = Cocoa/XPCService;
                        sourceTree = "<group>";
                };
                BC82837C16B45DA500A278FE /* EntryPoint */ = {
                                BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */,
                        );
                        name = XPCService;
-                       path = mac/XPCService;
+                       path = Cocoa/XPCService;
                        sourceTree = "<group>";
                };
                BC8283A216B4BD9100A278FE /* NetworkService */ = {
                                BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */,
                        );
                        name = XPCService;
-                       path = mac/XPCService;
+                       path = Cocoa/XPCService;
                        sourceTree = "<group>";
                };
                BC8283E916B4F8E200A278FE /* PluginService */ = {
                                BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */,
                        );
                        name = XPCService;
-                       path = mac/XPCService;
+                       path = Cocoa/XPCService;
                        sourceTree = "<group>";
                };
                BCACC43F16B24CAA00B6E092 /* WebContentService */ = {