Changeset 196370 in webkit
- Timestamp:
- Feb 10, 2016 10:20:12 AM (8 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r196363 r196370 1 2016-02-10 Dan Bernstein <mitz@apple.com> 2 3 [Mac] Stop installing the legacy processes 4 https://bugs.webkit.org/show_bug.cgi?id=154062 5 6 Reviewed by Anders Carlsson. 7 8 * Configurations/All.xcconfig: Removed the legacy processes from EXCLUDED_SOURCE_FILE_NAMES 9 for iOS, now that they are no longer included in a Copy Files build phase. 10 * Configurations/BaseLegacyProcess.xcconfig: Set SKIP_INSTALL to YES for OS X as well. 11 * WebKit2.xcodeproj/project.pbxproj: Removed the Copy Files build phase that copied the 12 processes into the framework in engineering builds. Renamed the “Add current version 13 symlinks” script build phase to “Add XPCServices symlink”, and changed it to do just that. 14 1 15 2016-02-09 Carlos Garcia Campos <cgarcia@igalia.com> 2 16 -
trunk/Source/WebKit2/Configurations/All.xcconfig
r177621 r196370 26 26 #include "BaseTarget.xcconfig" 27 27 28 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DatabaseProcess.app NetworkProcess.app PluginProcess.app WebProcess.app;29 30 28 SKIP_INSTALL = YES; -
trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig
r194022 r196370 36 36 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib; 37 37 38 SKIP_INSTALL [sdk=iphone*]= YES;38 SKIP_INSTALL = YES; -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r196321 r196370 12 12 buildConfigurationList = 1A50DB48110A3C27000D3FE5 /* Build configuration list for PBXAggregateTarget "All" */; 13 13 buildPhases = ( 14 1A50DB70110A3D67000D3FE5 /* Copy Files */, 15 BCFFCA8A160D6DEA003DF315 /* Add current version symlinks */, 14 BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */, 16 15 BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */, 17 16 ); … … 256 255 1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */; }; 257 256 1A4D664C18A3030E00D82E21 /* WKFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 258 1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */; };259 257 1A52C0F71A38CDC70016160A /* WebStorageNamespaceProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A52C0F51A38CDC70016160A /* WebStorageNamespaceProvider.cpp */; }; 260 258 1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A52C0F61A38CDC70016160A /* WebStorageNamespaceProvider.h */; }; … … 869 867 510AFFB916542048001BA05E /* WebResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510AFFB716542048001BA05E /* WebResourceLoader.cpp */; }; 870 868 510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 510AFFB816542048001BA05E /* WebResourceLoader.h */; }; 871 510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 510CC80E1613C79900D03ED3 /* NetworkProcess.app */; };872 869 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */; }; 873 870 510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; }; … … 978 975 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; }; 979 976 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; }; 980 51A60B2A180CCEB500F3BF50 /* DatabaseProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */; };981 977 51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 982 978 51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; }; … … 1618 1614 BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; }; 1619 1615 BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCDE059A11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp */; }; 1620 BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = BCDE094213272496001259FB /* PluginProcess.app */; };1621 1616 BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; }; 1622 1617 BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0937614FB128B001138D9 /* LayerHostingContext.h */; }; … … 2001 1996 ); 2002 1997 name = "Copy Message Generation Scripts"; 2003 runOnlyForDeploymentPostprocessing = 0;2004 };2005 1A50DB70110A3D67000D3FE5 /* Copy Files */ = {2006 isa = PBXCopyFilesBuildPhase;2007 buildActionMask = 2147483647;2008 dstPath = "WebKit.framework/$(FRAMEWORK_CONTENT_DIRECTORY)";2009 dstSubfolderSpec = 1;2010 files = (2011 51A60B2A180CCEB500F3BF50 /* DatabaseProcess.app in Copy Files */,2012 510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,2013 BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */,2014 1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */,2015 );2016 name = "Copy Files";2017 1998 runOnlyForDeploymentPostprocessing = 0; 2018 1999 }; … … 8900 8881 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi"; 8901 8882 }; 8902 BCFFCA8A160D6DEA003DF315 /* Add current version symlinks*/ = {8883 BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */ = { 8903 8884 isa = PBXShellScriptBuildPhase; 8904 8885 buildActionMask = 2147483647; … … 8907 8888 inputPaths = ( 8908 8889 ); 8909 name = "Add current version symlinks";8890 name = "Add XPCServices symlink"; 8910 8891 outputPaths = ( 8911 8892 "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit.framework/XPCServices", … … 8913 8894 runOnlyForDeploymentPostprocessing = 0; 8914 8895 shellPath = /bin/sh; 8915 shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n for name in XPCServices NetworkProcess.app PluginProcess.app DatabaseProcess.app WebProcess.app; do\n ln -sf \"Versions/Current/${name}\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/${name}\";\n done\nfi\n";8896 shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n ln -sf \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n"; 8916 8897 }; 8917 8898 BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
Note: See TracChangeset
for help on using the changeset viewer.