Changeset 240885 in webkit


Ignore:
Timestamp:
Feb 1, 2019, 3:32:42 PM (6 years ago)
Author:
achristensen@apple.com
Message:

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.
Location:
trunk/Source/WebKit
Files:
1 added
6 edited
4 moved

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/Source/WebKit/ChangeLog

    r240882 r240885  
     12019-02-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move XPCService entry points from mac directory to new Cocoa directory
     4        https://bugs.webkit.org/show_bug.cgi?id=194129
     5
     6        Reviewed by Chris Dumez.
     7
     8        * Configurations/NetworkService.xcconfig:
     9        * Configurations/PluginService.64.xcconfig:
     10        * Configurations/WebContentService.xcconfig:
     11        * NetworkProcess/EntryPoint/Cocoa: Copied from Source/WebKit/NetworkProcess/EntryPoint/mac.
     12        * NetworkProcess/EntryPoint/mac: Removed.
     13        * PluginProcess/EntryPoint/Cocoa: Copied from Source/WebKit/PluginProcess/EntryPoint/mac.
     14        * PluginProcess/EntryPoint/mac: Removed.
     15        * Shared/EntryPointUtilities/Cocoa: Copied from Source/WebKit/Shared/EntryPointUtilities/mac.
     16        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
     17        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm:
     18        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
     19        * Shared/EntryPointUtilities/mac: Removed.
     20        * SourcesCocoa.txt:
     21        * WebKit.xcodeproj/project.pbxproj:
     22        * WebProcess/EntryPoint/Cocoa: Copied from Source/WebKit/WebProcess/EntryPoint/mac.
     23        * WebProcess/EntryPoint/mac: Removed.
     24
    1252019-02-01  Wenson Hsieh  <wenson_hsieh@apple.com>
    226
  • TabularUnified trunk/Source/WebKit/Configurations/NetworkService.xcconfig

    r239819 r240885  
    3838PRODUCT_NAME = com.apple.WebKit.Networking;
    3939PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    40 INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
    41 INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
     40INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist;
     41INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist;
    4242
    4343OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
  • TabularUnified trunk/Source/WebKit/Configurations/PluginService.64.xcconfig

    r239841 r240885  
    2828PRODUCT_NAME = com.apple.WebKit.Plugin.64;
    2929PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    30 INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.64.Info.plist;
     30INFOPLIST_FILE = PluginProcess/EntryPoint/Cocoa/XPCService/PluginService.64.Info.plist;
    3131
    3232WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
  • TabularUnified trunk/Source/WebKit/Configurations/WebContentService.xcconfig

    r239819 r240885  
    4242
    4343PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    44 INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
    45 INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
     44INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-iOS.plist;
     45INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist;
    4646
    4747WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
  • TabularUnified trunk/Source/WebKit/SourcesCocoa.txt

    r240805 r240885  
    4040NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
    4141
    42 NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
     42NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
    4343
    4444NetworkProcess/ios/NetworkProcessIOS.mm
     
    8282Platform/unix/EnvironmentUtilities.cpp
    8383
    84 PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm @no-unify
     84PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm @no-unify
    8585
    8686PluginProcess/mac/PluginControllerProxyMac.mm @no-unify
     
    148148Shared/Cocoa/WKObject.mm
    149149
    150 Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
    151 Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
     150Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
     151Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
    152152
    153153Shared/ios/AuxiliaryProcessIOS.mm
     
    494494WebProcess/cocoa/WebProcessCocoa.mm
    495495
    496 WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
     496WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm
    497497
    498498WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
  • TabularUnified trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r240805 r240885  
    80368036                        );
    80378037                        name = XPCService;
    8038                         path = mac/XPCService;
     8038                        path = Cocoa/XPCService;
    80398039                        sourceTree = "<group>";
    80408040                };
     
    80628062                        );
    80638063                        name = XPCService;
    8064                         path = mac/XPCService;
     8064                        path = Cocoa/XPCService;
    80658065                        sourceTree = "<group>";
    80668066                };
     
    80818081                        );
    80828082                        name = XPCService;
    8083                         path = mac/XPCService;
     8083                        path = Cocoa/XPCService;
    80848084                        sourceTree = "<group>";
    80858085                };
     
    81488148                        );
    81498149                        name = XPCService;
    8150                         path = mac/XPCService;
     8150                        path = Cocoa/XPCService;
    81518151                        sourceTree = "<group>";
    81528152                };
Note: See TracChangeset for help on using the changeset viewer.