[Mac] Stop installing the legacy processes
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Feb 2016 18:20:12 +0000 (18:20 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Feb 2016 18:20:12 +0000 (18:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=154062

Reviewed by Anders Carlsson.

* Configurations/All.xcconfig: Removed the legacy processes from EXCLUDED_SOURCE_FILE_NAMES
  for iOS, now that they are no longer included in a Copy Files build phase.
* Configurations/BaseLegacyProcess.xcconfig: Set SKIP_INSTALL to YES for OS X as well.
* WebKit2.xcodeproj/project.pbxproj: Removed the Copy Files build phase that copied the
  processes into the framework in engineering builds. Renamed the “Add current version
  symlinks” script build phase to “Add XPCServices symlink”, and changed it to do just that.

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

Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/All.xcconfig
Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index 7614f88..a4a353f 100644 (file)
@@ -1,3 +1,17 @@
+2016-02-10  Dan Bernstein  <mitz@apple.com>
+
+        [Mac] Stop installing the legacy processes
+        https://bugs.webkit.org/show_bug.cgi?id=154062
+
+        Reviewed by Anders Carlsson.
+
+        * Configurations/All.xcconfig: Removed the legacy processes from EXCLUDED_SOURCE_FILE_NAMES
+          for iOS, now that they are no longer included in a Copy Files build phase.
+        * Configurations/BaseLegacyProcess.xcconfig: Set SKIP_INSTALL to YES for OS X as well.
+        * WebKit2.xcodeproj/project.pbxproj: Removed the Copy Files build phase that copied the
+          processes into the framework in engineering builds. Renamed the “Add current version
+          symlinks” script build phase to “Add XPCServices symlink”, and changed it to do just that.
+
 2016-02-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION(r196183): [GTK] Broke TestInspector
index e11ece9..71e4595 100644 (file)
@@ -25,6 +25,4 @@
 
 #include "BaseTarget.xcconfig"
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DatabaseProcess.app NetworkProcess.app PluginProcess.app WebProcess.app;
-
 SKIP_INSTALL = YES;
index d9bff8a..2234b81 100644 (file)
@@ -35,4 +35,4 @@ EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
 
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib;
 
-SKIP_INSTALL[sdk=iphone*] = YES;
+SKIP_INSTALL = YES;
index 640b56b..d908ede 100644 (file)
@@ -11,8 +11,7 @@
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 1A50DB48110A3C27000D3FE5 /* Build configuration list for PBXAggregateTarget "All" */;
                        buildPhases = (
-                               1A50DB70110A3D67000D3FE5 /* Copy Files */,
-                               BCFFCA8A160D6DEA003DF315 /* Add current version symlinks */,
+                               BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */,
                                BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
                        );
                        dependencies = (
                1A4D664818A2D91A00D82E21 /* APIUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664718A2D91A00D82E21 /* APIUIClient.h */; };
                1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */; };
                1A4D664C18A3030E00D82E21 /* WKFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */; };
                1A52C0F71A38CDC70016160A /* WebStorageNamespaceProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A52C0F51A38CDC70016160A /* WebStorageNamespaceProvider.cpp */; };
                1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A52C0F61A38CDC70016160A /* WebStorageNamespaceProvider.h */; };
                1A53C2A21A323004004E8C70 /* InjectedBundleCSSStyleDeclarationHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4ED3261A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.cpp */; };
                5106D7C418BDBE73000AB166 /* ContextMenuContextData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5106D7C018BDBE73000AB166 /* ContextMenuContextData.h */; };
                510AFFB916542048001BA05E /* WebResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510AFFB716542048001BA05E /* WebResourceLoader.cpp */; };
                510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 510AFFB816542048001BA05E /* WebResourceLoader.h */; };
-               510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 510CC80E1613C79900D03ED3 /* NetworkProcess.app */; };
                510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */; };
                510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; };
                5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */; };
                51A555F5128C6C47009ABCEC /* WKContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A555F3128C6C47009ABCEC /* WKContextMenuItem.cpp */; };
                51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               51A60B2A180CCEB500F3BF50 /* DatabaseProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */; };
                51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
                51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */; };
                BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
                BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
                BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCDE059A11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp */; };
-               BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = BCDE094213272496001259FB /* PluginProcess.app */; };
                BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; };
                BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0937614FB128B001138D9 /* LayerHostingContext.h */; };
                BCE0E425168B7A280057E66A /* WebProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0E424168B7A280057E66A /* WebProcessSupplement.h */; };
                        name = "Copy Message Generation Scripts";
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               1A50DB70110A3D67000D3FE5 /* Copy Files */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "WebKit.framework/$(FRAMEWORK_CONTENT_DIRECTORY)";
-                       dstSubfolderSpec = 1;
-                       files = (
-                               51A60B2A180CCEB500F3BF50 /* DatabaseProcess.app in Copy Files */,
-                               510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
-                               BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */,
-                               1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */,
-                       );
-                       name = "Copy Files";
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                372589431C1E496800C92CA9 /* Copy Shims */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        shellPath = /bin/sh;
                        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";
                };
-               BCFFCA8A160D6DEA003DF315 /* Add current version symlinks */ = {
+               BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        inputPaths = (
                        );
-                       name = "Add current version symlinks";
+                       name = "Add XPCServices symlink";
                        outputPaths = (
                                "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit.framework/XPCServices",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       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";
+                       shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n    ln -sf \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n";
                };
                BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
                        isa = PBXShellScriptBuildPhase;