Changeset 164547 in webkit


Ignore:
Timestamp:
Feb 22, 2014 10:44:28 AM (10 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/12500358> [Cocoa] Development variants of XPC services should not be installed in WebKit2.framework/XPCServices
​https://bugs.webkit.org/show_bug.cgi?id=129197

Reviewed by Sam Weinig.

  • Configurations/BaseXPCService.xcconfig: Made INSTALL_PATH vary based on

WK_XPC_SERVICE_VARIANT. For the Development variant, use an install path outside the
framework. Note that engineering builds using the build action continue to have the
Development variants copied into the framework by a script build phase.

  • Configurations/DatabaseService.Development.xcconfig: Set WK_XPC_SERVICE_VARIANT.
  • Configurations/DatabaseService.xcconfig: Ditto.
  • Configurations/NetworkService.Development.xcconfig: Ditto.
  • Configurations/NetworkService.xcconfig: Ditto.
  • Configurations/PluginService.32.xcconfig: Ditto.
  • Configurations/PluginService.64.xcconfig: Ditto.
  • Configurations/PluginService.Development.xcconfig: Ditto.
  • Configurations/WebContentService.Development.xcconfig: Ditto.
  • Configurations/WebContentService.xcconfig: Ditto.
Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r164527 r164547  
     12014-02-22  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/12500358> [Cocoa] Development variants of XPC services should not be installed in WebKit2.framework/XPCServices
     4        https://bugs.webkit.org/show_bug.cgi?id=129197
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/BaseXPCService.xcconfig: Made INSTALL_PATH vary based on
     9        WK_XPC_SERVICE_VARIANT. For the Development variant, use an install path outside the
     10        framework. Note that engineering builds using the build action continue to have the
     11        Development variants copied into the framework by a script build phase.
     12        * Configurations/DatabaseService.Development.xcconfig: Set WK_XPC_SERVICE_VARIANT.
     13        * Configurations/DatabaseService.xcconfig: Ditto.
     14        * Configurations/NetworkService.Development.xcconfig: Ditto.
     15        * Configurations/NetworkService.xcconfig: Ditto.
     16        * Configurations/PluginService.32.xcconfig: Ditto.
     17        * Configurations/PluginService.64.xcconfig: Ditto.
     18        * Configurations/PluginService.Development.xcconfig: Ditto.
     19        * Configurations/WebContentService.Development.xcconfig: Ditto.
     20        * Configurations/WebContentService.xcconfig: Ditto.
     21
    1222014-02-21  Brent Fulgham  <bfulgham@apple.com>
    223

  • trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig

    r161829 r164547  
    2525
    2626GCC_ENABLE_OBJC_GC = NO;
    27 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    28 INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
    29 INSTALL_PATH_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
     27
     28INSTALL_PATH = $(INSTALL_PATH_$(WK_XPC_SERVICE_VARIANT));
     29
     30INSTALL_PATH_Normal = $(INSTALL_PATH_Normal_$(PLATFORM_NAME));
     31INSTALL_PATH_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
     32INSTALL_PATH_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
     33
     34INSTALL_PATH_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
    3035
    3136APP_ICON = $(APP_ICON_$(CONFIGURATION));

  • trunk/Source/WebKit2/Configurations/DatabaseService.Development.xcconfig

    r157469 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Development;
     27
    2628PRODUCT_NAME = com.apple.WebKit.Databases.Development;
    2729INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/Info.plist;

  • trunk/Source/WebKit2/Configurations/DatabaseService.xcconfig

    r157469 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Normal;
     27
    2628PRODUCT_NAME = com.apple.WebKit.Databases;
    2729INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;

  • trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig

    r163425 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Development;
     27
    2628PRODUCT_NAME = com.apple.WebKit.Networking.Development;
    2729INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));

  • trunk/Source/WebKit2/Configurations/NetworkService.xcconfig

    r160661 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Normal;
     27
    2628PRODUCT_NAME = com.apple.WebKit.Networking;
    2729INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));

  • trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig

    r163099 r164547  
    2323
    2424#include "BaseXPCService.xcconfig"
     25
     26WK_XPC_SERVICE_VARIANT = Normal;
    2527
    2628VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));

  • trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig

    r162658 r164547  
    2323
    2424#include "BaseXPCService.xcconfig"
     25
     26WK_XPC_SERVICE_VARIANT = Normal;
    2527
    2628ARCHS = $(ARCHS_$(PLATFORM_NAME));

  • trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig

    r162658 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Development;
     27
    2628PRODUCT_NAME = com.apple.WebKit.Plugin.Development;
    2729INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;

  • trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig

    r163588 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Development;
     27
    2628PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
    2729INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));

  • trunk/Source/WebKit2/Configurations/WebContentService.xcconfig

    r163588 r164547  
    2424#include "BaseXPCService.xcconfig"
    2525
     26WK_XPC_SERVICE_VARIANT = Normal;
     27
    2628PRODUCT_NAME = com.apple.WebKit.WebContent;
    2729
Note: See TracChangeset for help on using the changeset viewer.