Changeset 194022 in webkit
- Timestamp:
- Dec 13, 2015 7:19:47 PM (8 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r194019 r194022 1 2015-12-13 Dan Bernstein <mitz@apple.com> 2 3 [Mac] Shims used by XPC services are installed inside legacy process bundles 4 https://bugs.webkit.org/show_bug.cgi?id=152233 5 6 Reviewed by Sam Weinig. 7 8 Have the shim dylibs installed in the framework’s Frameworks directory instead. 9 10 * Configurations/BaseLegacyProcess.xcconfig: Simplified now that EXCLUDED_SHIM_FILE_NAME is 11 no longer defined, because shims aren’t copied into legacy processes. 12 13 * Configurations/NetworkProcess.xcconfig: Removed definition of EXCLUDED_SHIM_FILE_NAME. 14 * Configurations/PluginProcess.xcconfig: Ditto. 15 * Configurations/WebContentProcess.xcconfig: Ditto. 16 17 * Configurations/Shim.xcconfig: Install the shims when building for OS X. Added definitions 18 of INSTALL_PATH and DYLIB_INSTALL_NAME_BASE which are now common to all shims. 19 20 * Configurations/PluginProcessShim.xcconfig: Removed definitions of INSTALL_PATH and 21 DYLIB_INSTALL_NAME_BASE from here, now that they are defined for all shims in 22 Shim.xcconfig. 23 * Configurations/SecItemShim.xcconfig: Ditto. 24 * Configurations/WebProcessShim.xcconfig: 25 26 * Configurations/WebKit.xcconfig: Added the shims to EXCLUDED_SOURCE_FILE_NAMES for iOS. 27 28 * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed 29 the value of DYLD_INSERT_LIBRARIES to point to the shim’s new location. 30 * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto. 31 * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto. 32 33 * UIProcess/Launcher/mac/ProcessLauncherMac.mm: 34 (WebKit::computeProcessShimPath): Changed to return the new paths, which are all inside the 35 framework’s Frameworks directory. 36 37 * WebKit2.xcodeproj/project.pbxproj: 38 - Removed references to WRAPPER_NAME from the “Copy XPC services for engineering builds” 39 build phase in the All target, becase WRAPPER_NAME is empty in an aggregate target. 40 - Removed the PlugInProcess target’s dependency on the PluginProcessShim target and its 41 Copy Plug-in Process Shim build phase. 42 - Removed the NetworkProcess target’s dependency on the SecItemShim target and its Copy 43 Sec Item Shim build phase. 44 - Removed the WebProcess target’s dependency on the WebProcessShim target and its Copy 45 WebProcessShim build phase. 46 - Made the WebKit target depend on the shim targets, and added to it a Copy Shims build 47 phase that copies the shims into the framework’s Frameworks directory. 48 1 49 2015-12-13 Dan Bernstein <mitz@apple.com> 2 50 -
trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig
r193378 r194022 32 32 33 33 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)); 34 EXCLUDED_SOURCE_FILE_NAMES_Production = $(EXCLUDED_SHIM_FILE_NAME) WebKit.icns; 35 EXCLUDED_SOURCE_FILE_NAMES_Debug = $(EXCLUDED_SHIM_FILE_NAME); 36 EXCLUDED_SOURCE_FILE_NAMES_Release = $(EXCLUDED_SHIM_FILE_NAME); 34 EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns; 37 35 38 36 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib; -
trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig
r177621 r194022 27 27 INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist; 28 28 29 EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = SecItemShim.dylib;30 31 29 CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements; -
trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig
r194019 r194022 33 33 LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib; 34 34 35 EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;36 37 35 SKIP_INSTALL[sdk=iphone*] = YES; -
trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig
r190837 r194022 26 26 #include "Shim.xcconfig" 27 27 28 INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;29 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;30 31 28 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM); 32 29 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore; -
trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig
r190837 r194022 26 26 #include "Shim.xcconfig" 27 27 28 INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;29 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;30 31 28 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM); 32 29 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security; -
trunk/Source/WebKit2/Configurations/Shim.xcconfig
r87221 r194022 26 26 GCC_DYNAMIC_NO_PIC = NO; 27 27 SKIP_INSTALL = YES; 28 SKIP_INSTALL[sdk=macosx*] = NO; 28 29 30 INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks; 31 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks; -
trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig
r177621 r194022 27 27 INFOPLIST_FILE = WebProcess/EntryPoint/mac/LegacyProcess/Info.plist; 28 28 29 EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = WebProcessShim.dylib;30 31 29 CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/WebContent-iOS.entitlements; -
trunk/Source/WebKit2/Configurations/WebKit.xcconfig
r190837 r194022 49 49 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order; 50 50 51 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;51 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PlugInProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb; 52 52 53 53 INSTALLHDRS_SCRIPT_PHASE = YES; -
trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig
r190837 r194022 26 26 #include "Shim.xcconfig" 27 27 28 INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;29 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;30 31 28 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM); 32 29 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework CoreServices -framework Security; -
trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist
r184215 r194022 44 44 <dict> 45 45 <key>DYLD_INSERT_LIBRARIES</key> 46 <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/ NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>46 <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/SecItemShim.dylib</string> 47 47 </dict> 48 48 </dict> -
trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist
r184215 r194022 50 50 <dict> 51 51 <key>DYLD_INSERT_LIBRARIES</key> 52 <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/ PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>52 <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/PluginProcessShim.dylib</string> 53 53 <key>NSStringDisableTagged</key> 54 54 <string>YES</string> -
trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
r192697 r194022 98 98 { 99 99 #if ENABLE(NETSCAPE_PLUGIN_API) 100 if (launchOptions.processType == ProcessLauncher::PluginProcess) { 101 NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"]; 102 NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath]; 103 104 return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"]; 105 } 106 #endif 107 108 if (launchOptions.processType == ProcessLauncher::NetworkProcess) { 109 NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"]; 110 NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath]; 111 112 return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"]; 113 } 114 115 if (launchOptions.processType == ProcessLauncher::WebProcess) { 116 NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"]; 117 NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath]; 118 119 return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"]; 120 } 100 if (launchOptions.processType == ProcessLauncher::PluginProcess) 101 return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"PluginProcessShim.dylib"]; 102 #endif 103 104 if (launchOptions.processType == ProcessLauncher::NetworkProcess) 105 return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"SecItemShim.dylib"]; 106 107 if (launchOptions.processType == ProcessLauncher::WebProcess) 108 return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"WebProcessShim.dylib"]; 121 109 122 110 return nil; -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r193944 r194022 829 829 37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 830 830 37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; }; 831 37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; }; 832 37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; }; 833 37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; }; 831 834 37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 832 835 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; }; … … 1619 1622 BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; }; 1620 1623 BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCDE059A11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp */; }; 1621 BCDE093D13272496001259FB /* PluginProcessShim.dylib in Copy Plug-in Process Shim */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };1622 1624 BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = BCDE094213272496001259FB /* PluginProcess.app */; }; 1623 1625 BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; }; … … 1728 1730 CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; }; 1729 1731 CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */; }; 1730 CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };1731 1732 CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */; }; 1732 1733 CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */; }; … … 1766 1767 E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */; }; 1767 1768 E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6912169B667B009B6670 /* SecItemShimMessages.h */; }; 1768 E1790901169BB4F9006904C7 /* SecItemShim.dylib in Copy Sec Item Shim */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; };1769 1769 E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1798C7716E6818800240139 /* NetworkBlobRegistry.cpp */; }; 1770 1770 E1798C7A16E6818800240139 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1798C7816E6818800240139 /* NetworkBlobRegistry.h */; }; … … 1925 1925 remoteInfo = WebKit; 1926 1926 }; 1927 37B1D0131C1E421100D67FE9 /* PBXContainerItemProxy */ = { 1928 isa = PBXContainerItemProxy; 1929 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1930 proxyType = 1; 1931 remoteGlobalIDString = 1AC25FAF12A48EA700BD2671; 1932 remoteInfo = PluginProcessShim; 1933 }; 1934 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */ = { 1935 isa = PBXContainerItemProxy; 1936 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1937 proxyType = 1; 1938 remoteGlobalIDString = 510031EA1379CACB00C8DFE4; 1939 remoteInfo = SecItemShim; 1940 }; 1941 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */ = { 1942 isa = PBXContainerItemProxy; 1943 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1944 proxyType = 1; 1945 remoteGlobalIDString = CDC382FB17211799008A2FC3; 1946 remoteInfo = WebProcessShim; 1947 }; 1927 1948 37F7407812721F740093869B /* PBXContainerItemProxy */ = { 1928 1949 isa = PBXContainerItemProxy; … … 2023 2044 remoteInfo = WebProcessServiceForWebKitDevelopment; 2024 2045 }; 2025 BCDE093513272496001259FB /* PBXContainerItemProxy */ = {2026 isa = PBXContainerItemProxy;2027 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;2028 proxyType = 1;2029 remoteGlobalIDString = 1AC25FAF12A48EA700BD2671;2030 remoteInfo = PluginProcessShim;2031 };2032 2046 BCDE093713272496001259FB /* PBXContainerItemProxy */ = { 2033 2047 isa = PBXContainerItemProxy; … … 2043 2057 remoteGlobalIDString = BCDE093313272496001259FB; 2044 2058 remoteInfo = "Plugin Process"; 2045 };2046 CDC3830917211ABE008A2FC3 /* PBXContainerItemProxy */ = {2047 isa = PBXContainerItemProxy;2048 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;2049 proxyType = 1;2050 remoteGlobalIDString = CDC382FB17211799008A2FC3;2051 remoteInfo = WebProcessShim;2052 };2053 CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */ = {2054 isa = PBXContainerItemProxy;2055 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;2056 proxyType = 1;2057 remoteGlobalIDString = 510031EA1379CACB00C8DFE4;2058 remoteInfo = SecItemShim;2059 2059 }; 2060 2060 E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */ = { … … 2103 2103 runOnlyForDeploymentPostprocessing = 0; 2104 2104 }; 2105 5183B38F1379F56800E8754E /* Copy WebProcessShim*/ = {2105 372589431C1E496800C92CA9 /* Copy Shims */ = { 2106 2106 isa = PBXCopyFilesBuildPhase; 2107 2107 buildActionMask = 2147483647; 2108 dstPath = WebProcess.app/Contents/MacOS;2109 dstSubfolderSpec = 1 6;2108 dstPath = ""; 2109 dstSubfolderSpec = 10; 2110 2110 files = ( 2111 CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */, 2112 ); 2113 name = "Copy WebProcessShim"; 2111 37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */, 2112 37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */, 2113 37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */, 2114 ); 2115 name = "Copy Shims"; 2114 2116 runOnlyForDeploymentPostprocessing = 0; 2115 2117 }; … … 2141 2143 A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */, 2142 2144 ); 2143 runOnlyForDeploymentPostprocessing = 0;2144 };2145 BCDE093C13272496001259FB /* Copy Plug-in Process Shim */ = {2146 isa = PBXCopyFilesBuildPhase;2147 buildActionMask = 2147483647;2148 dstPath = PluginProcess.app/Contents/MacOS;2149 dstSubfolderSpec = 16;2150 files = (2151 BCDE093D13272496001259FB /* PluginProcessShim.dylib in Copy Plug-in Process Shim */,2152 );2153 name = "Copy Plug-in Process Shim";2154 runOnlyForDeploymentPostprocessing = 0;2155 };2156 E1790900169BB4D3006904C7 /* Copy Sec Item Shim */ = {2157 isa = PBXCopyFilesBuildPhase;2158 buildActionMask = 2147483647;2159 dstPath = NetworkProcess.app/Contents/MacOS;2160 dstSubfolderSpec = 16;2161 files = (2162 E1790901169BB4F9006904C7 /* SecItemShim.dylib in Copy Sec Item Shim */,2163 );2164 name = "Copy Sec Item Shim";2165 2145 runOnlyForDeploymentPostprocessing = 0; 2166 2146 }; … … 8534 8514 1A50DB1A110A3BDC000D3FE5 /* Resources */, 8535 8515 1A50DB1B110A3BDC000D3FE5 /* Sources */, 8536 5183B38F1379F56800E8754E /* Copy WebProcessShim */,8537 8516 BC5D24B016CC3F28007D5461 /* Frameworks */, 8538 8517 ); … … 8540 8519 ); 8541 8520 dependencies = ( 8542 CDC3830A17211ABE008A2FC3 /* PBXTargetDependency */,8543 8521 1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */, 8544 8522 ); … … 8588 8566 510CC80A1613C79900D03ED3 /* Sources */, 8589 8567 510CC80C1613C79900D03ED3 /* Resources */, 8590 E1790900169BB4D3006904C7 /* Copy Sec Item Shim */,8591 8568 BC5D24B416CC3F43007D5461 /* Frameworks */, 8592 8569 ); … … 8594 8571 ); 8595 8572 dependencies = ( 8596 CDC8F4D51725F73F00166F6E /* PBXTargetDependency */,8597 8573 510CC8511613C98D00D03ED3 /* PBXTargetDependency */, 8598 8574 ); … … 8668 8644 1A1D2115191D96380001619F /* Postprocess Framework Headers */, 8669 8645 8DC2EF520486A6940098B216 /* Resources */, 8646 372589431C1E496800C92CA9 /* Copy Shims */, 8670 8647 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */, 8671 8648 37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */, … … 8684 8661 dependencies = ( 8685 8662 37F7407912721F740093869B /* PBXTargetDependency */, 8663 37B1D0141C1E421100D67FE9 /* PBXTargetDependency */, 8664 37B1D0161C1E421100D67FE9 /* PBXTargetDependency */, 8665 37B1D0181C1E421100D67FE9 /* PBXTargetDependency */, 8686 8666 ); 8687 8667 name = WebKit; … … 8825 8805 BCDE093813272496001259FB /* Resources */, 8826 8806 BCDE093A13272496001259FB /* Sources */, 8827 BCDE093C13272496001259FB /* Copy Plug-in Process Shim */,8828 8807 BC5D24B216CC3F3B007D5461 /* Frameworks */, 8829 8808 ); … … 8831 8810 ); 8832 8811 dependencies = ( 8833 BCDE093413272496001259FB /* PBXTargetDependency */,8834 8812 BCDE093613272496001259FB /* PBXTargetDependency */, 8835 8813 ); … … 9294 9272 name = "Copy XPC services for engineering builds"; 9295 9273 outputPaths = ( 9296 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",9297 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",9298 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",9299 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",9300 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",9301 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",9302 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc",9303 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc",9304 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",9305 "$(BUILT_PRODUCTS_DIR)/ ${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",9274 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc", 9275 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc", 9276 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc", 9277 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc", 9278 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc", 9279 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc", 9280 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc", 9281 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc", 9282 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc", 9283 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc", 9306 9284 ); 9307 9285 runOnlyForDeploymentPostprocessing = 0; 9308 9286 shellPath = /bin/sh; 9309 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/ ${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.Development.xpc\"\nfi\n";9287 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.Development.xpc\"\nfi\n"; 9310 9288 }; 9311 9289 C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = { … … 10357 10335 targetProxy = 375E063E191EAA33004E3CAF /* PBXContainerItemProxy */; 10358 10336 }; 10337 37B1D0141C1E421100D67FE9 /* PBXTargetDependency */ = { 10338 isa = PBXTargetDependency; 10339 target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */; 10340 targetProxy = 37B1D0131C1E421100D67FE9 /* PBXContainerItemProxy */; 10341 }; 10342 37B1D0161C1E421100D67FE9 /* PBXTargetDependency */ = { 10343 isa = PBXTargetDependency; 10344 target = 510031EA1379CACB00C8DFE4 /* SecItemShim */; 10345 targetProxy = 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */; 10346 }; 10347 37B1D0181C1E421100D67FE9 /* PBXTargetDependency */ = { 10348 isa = PBXTargetDependency; 10349 target = CDC382FB17211799008A2FC3 /* WebProcessShim */; 10350 targetProxy = 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */; 10351 }; 10359 10352 37F7407912721F740093869B /* PBXTargetDependency */ = { 10360 10353 isa = PBXTargetDependency; … … 10427 10420 targetProxy = BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */; 10428 10421 }; 10429 BCDE093413272496001259FB /* PBXTargetDependency */ = {10430 isa = PBXTargetDependency;10431 target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;10432 targetProxy = BCDE093513272496001259FB /* PBXContainerItemProxy */;10433 };10434 10422 BCDE093613272496001259FB /* PBXTargetDependency */ = { 10435 10423 isa = PBXTargetDependency; … … 10441 10429 target = BCDE093313272496001259FB /* PluginProcess */; 10442 10430 targetProxy = BCDE0AC013272712001259FB /* PBXContainerItemProxy */; 10443 };10444 CDC3830A17211ABE008A2FC3 /* PBXTargetDependency */ = {10445 isa = PBXTargetDependency;10446 target = CDC382FB17211799008A2FC3 /* WebProcessShim */;10447 targetProxy = CDC3830917211ABE008A2FC3 /* PBXContainerItemProxy */;10448 };10449 CDC8F4D51725F73F00166F6E /* PBXTargetDependency */ = {10450 isa = PBXTargetDependency;10451 target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;10452 targetProxy = CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */;10453 10431 }; 10454 10432 E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */ = { -
trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist
r184215 r194022 50 50 <dict> 51 51 <key>DYLD_INSERT_LIBRARIES</key> 52 <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/ WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>52 <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/WebProcessShim.dylib</string> 53 53 </dict> 54 54 </dict>
Note: See TracChangeset
for help on using the changeset viewer.