Source/WebKit2/ChangeLog

112012-09-21 Sam Weinig <sam@webkit.org>
22
 3 Install WebProcess XPC services into the right places
 4 https://bugs.webkit.org/show_bug.cgi?id=97385
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * Configurations/WebProcessService.xcconfig:
 9 Update INSTALL_PATH to go into WebKit2.framework/Versions/A/XPCServices.
 10
 11 * Configurations/WebProcessServiceForWebKitDevelopment.xcconfig:
 12 Since this config file is almost identical to WebProcessService.xcconfig,
 13 just #include it and change the one thing that is different, the INFOPLIST_FILE
 14
 15 * WebKit2.xcodeproj/project.pbxproj:
 16 Follow XPC procedure and copy the services into the right place, WebKit2.framework/Versions/A/XPCServices
 17 in all builds except production builds where it is not necessary. Also add a symlink like everyone else
 18 does.
 19
 202012-09-21 Sam Weinig <sam@webkit.org>
 21
322 WebProcess XPC services need have their environment set without disrupting all other XPC services
423 https://bugs.webkit.org/show_bug.cgi?id=95161
524

Source/WebKit2/Configurations/WebProcessService.xcconfig

2626GCC_ENABLE_OBJC_GC = NO;
2727PRODUCT_NAME = com.apple.WebKit2.$(TARGET_NAME:rfc1034identifier);
2828INFOPLIST_FILE = WebProcessService/Info.plist;
29 INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
 29INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
3030
3131APP_ICON = $(APP_ICON_$(CONFIGURATION));
3232APP_ICON_Debug = WebKit.icns;

Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig

2121// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323
24 #include "BaseTarget.xcconfig"
 24#include "WebProcessService.xcconfig"
2525
26 GCC_ENABLE_OBJC_GC = NO;
27 PRODUCT_NAME = com.apple.WebKit2.$(TARGET_NAME:rfc1034identifier);
2826INFOPLIST_FILE = WebProcessServiceForWebKitDevelopment/Info.plist;
29 INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
30 
31 APP_ICON = $(APP_ICON_$(CONFIGURATION));
32 APP_ICON_Debug = WebKit.icns;
33 APP_ICON_Release = WebKit.icns;
34 APP_ICON_Production = ;
35 
36 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
37 EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
38 
39 WRAPPER_EXTENSION = xpc;
40 MACH_O_TYPE = mh_execute;

Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

1212 buildConfigurationList = 1A50DB48110A3C27000D3FE5 /* Build configuration list for PBXAggregateTarget "All" */;
1313 buildPhases = (
1414 1A50DB70110A3D67000D3FE5 /* CopyFiles */,
15  BCA8D46B15BCE33C009DC1F1 /* CopyFiles */,
 15 BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */,
 16 BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
1617 );
1718 dependencies = (
1819 1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */,

728729 BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */; };
729730 BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */; };
730731 BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
731  BCA8D46C15BCE34B009DC1F1 /* com.apple.WebKit2.WebProcessService.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = BC3DE46615A91763008D26FC /* com.apple.WebKit2.WebProcessService.xpc */; };
732732 BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
733733 BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
734734 BCAE9DFB160C0AA100A33217 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
735  BCAE9DFE160C0AC500A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = BCAE9DE9160C097400A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc */; };
736735 BCAE9E05160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */; };
737736 BCAE9E07160C139A00A33217 /* WebProcessServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAE9E06160C139A00A33217 /* WebProcessServiceMain.mm */; };
738737 BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };

10501049 name = "Copy Message Generation Scripts";
10511050 runOnlyForDeploymentPostprocessing = 0;
10521051 };
1053  BCA8D46B15BCE33C009DC1F1 /* CopyFiles */ = {
1054  isa = PBXCopyFilesBuildPhase;
1055  buildActionMask = 2147483647;
1056  dstPath = WebKit2.framework/XPCServices;
1057  dstSubfolderSpec = 1;
1058  files = (
1059  BCA8D46C15BCE34B009DC1F1 /* com.apple.WebKit2.WebProcessService.xpc in CopyFiles */,
1060  BCAE9DFE160C0AC500A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc in CopyFiles */,
1061  );
1062  runOnlyForDeploymentPostprocessing = 0;
1063  };
10641052 BCDE093C13272496001259FB /* Copy Plug-in Process Shim */ = {
10651053 isa = PBXCopyFilesBuildPhase;
10661054 buildActionMask = 2147483647;

46384626 shellPath = /bin/sh;
46394627 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n";
46404628 };
 4629 BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */ = {
 4630 isa = PBXShellScriptBuildPhase;
 4631 buildActionMask = 2147483647;
 4632 files = (
 4633 );
 4634 inputPaths = (
 4635 );
 4636 name = "Add XPCServices symlink";
 4637 outputPaths = (
 4638 "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit2.framework/XPCServices",
 4639 );
 4640 runOnlyForDeploymentPostprocessing = 0;
 4641 shellPath = /bin/sh;
 4642 shellScript = "ln -sf ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\n";
 4643 };
 4644 BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
 4645 isa = PBXShellScriptBuildPhase;
 4646 buildActionMask = 2147483647;
 4647 files = (
 4648 );
 4649 inputPaths = (
 4650 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit2.WebProcessService.xpc",
 4651 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc",
 4652 );
 4653 name = "Copy XPC services for engineering builds";
 4654 outputPaths = (
 4655 "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit2.WebProcessService.xpc",
 4656 "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc",
 4657 );
 4658 runOnlyForDeploymentPostprocessing = 0;
 4659 shellPath = /bin/sh;
 4660 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nXPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit2.WebProcessService.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit2.WebProcessService.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc\"\n";
 4661 };
46414662 C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
46424663 isa = PBXShellScriptBuildPhase;
46434664 buildActionMask = 2147483647;