Changeset 143544 in webkit


Ignore:
Timestamp:
Feb 20, 2013 5:29:07 PM (11 years ago)
Author:
mrowe@apple.com
Message:

<https://webkit.org/b/110410> Specify the plug-in process / service entitlements via the Xcode configuration.

This is the modern mechanism for applying entitlements to production builds,
and it simplifies the maintenance of entitlements going forward. It also allows
us to fix the new XPC PluginServices to have the same entitlements as PluginProcess.

Reviewed by Alexey Proskuryakov.

  • Configurations/Base.xcconfig: Ad-hoc sign all WebKit2 components.
  • Configurations/PluginProcess.xcconfig: Specify the entitlements to use.
  • Configurations/PluginService.32.xcconfig: Ditto.
  • Configurations/PluginService.64.xcconfig: Ditto.
  • Configurations/PluginService.Development.xcconfig: Ditto.
  • Configurations/PluginService.entitlements: Renamed from Source/WebKit2/PluginProcess/mac/PluginProcess.entitlements.

Move the entitlements in to the Configurations directory to make them easier to find.

  • PluginProcess/mac/add-entitlements.sh: Removed. In my testing the dependency issue mentioned

in the script is not an issue with current versions of Xcode. If we see it again we can come
up with a workaround that doesn't involve performing the signing via a script phase.

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
1 deleted
7 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r143543 r143544  
     12013-02-20  Mark Rowe  <mrowe@apple.com>
     2
     3        <https://webkit.org/b/110410> Specify the plug-in process / service entitlements via the Xcode configuration.
     4
     5        This is the modern mechanism for applying entitlements to production builds,
     6        and it simplifies the maintenance of entitlements going forward. It also allows
     7        us to fix the new XPC PluginServices to have the same entitlements as PluginProcess.
     8
     9        Reviewed by Alexey Proskuryakov.
     10
     11        * Configurations/Base.xcconfig: Ad-hoc sign all WebKit2 components.
     12        * Configurations/PluginProcess.xcconfig: Specify the entitlements to use.
     13        * Configurations/PluginService.32.xcconfig: Ditto.
     14        * Configurations/PluginService.64.xcconfig: Ditto.
     15        * Configurations/PluginService.Development.xcconfig: Ditto.
     16        * Configurations/PluginService.entitlements: Renamed from Source/WebKit2/PluginProcess/mac/PluginProcess.entitlements.
     17        Move the entitlements in to the Configurations directory to make them easier to find.
     18        * PluginProcess/mac/add-entitlements.sh: Removed. In my testing the dependency issue mentioned
     19        in the script is not an issue with current versions of Xcode. If we see it again we can come
     20        up with a workaround that doesn't involve performing the signing via a script phase.
     21        * WebKit2.xcodeproj/project.pbxproj:
     22
    1232013-02-20  Mark Rowe  <mrowe@apple.com>
    224
  • trunk/Source/WebKit2/Configurations/Base.xcconfig

    r142903 r143544  
    9393SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
    9494SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
     95
     96CODE_SIGN_IDENTITY = -;
  • trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig

    r142806 r143544  
    2626PRODUCT_NAME = PluginProcess;
    2727INFOPLIST_FILE = PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist;
     28CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
  • trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig

    r143543 r143544  
    3838
    3939OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS);
     40
     41CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
  • trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig

    r143543 r143544  
    3838
    3939OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS);
     40
     41CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
  • trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig

    r140929 r143544  
    2626PRODUCT_NAME = com.apple.WebKit.Plugin.Development;
    2727INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
     28
     29CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r143117 r143544  
    19431943                5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
    19441944                5D1A238E15E75AD50023E981 /* webkit2 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = webkit2; sourceTree = "<group>"; };
     1945                5D442A5516D5856700AC3331 /* PluginService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginService.entitlements; sourceTree = "<group>"; };
    19451946                5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIClientTraits.cpp; sourceTree = "<group>"; };
    19461947                5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIClientTraits.h; sourceTree = "<group>"; };
     
    25262527                E13A8A2C162879AC00392929 /* SharedWorkerProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SharedWorkerProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
    25272528                E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SharedWorkerProcess.xcconfig; sourceTree = "<group>"; };
    2528                 E14E99F814D879B4001D221F /* PluginProcess.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginProcess.entitlements; sourceTree = "<group>"; };
    2529                 E14E99F914D879C9001D221F /* add-entitlements.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "add-entitlements.sh"; sourceTree = "<group>"; };
    25302529                E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildProcessProxy.cpp; sourceTree = "<group>"; };
    25312530                E1513C65166EABB200149FCB /* ChildProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessProxy.h; sourceTree = "<group>"; };
     
    28772876                        isa = PBXGroup;
    28782877                        children = (
    2879                                 E14E99F914D879C9001D221F /* add-entitlements.sh */,
    28802878                                1A2D91A51281D739001EB962 /* PluginControllerProxyMac.mm */,
    2881                                 E14E99F814D879B4001D221F /* PluginProcess.entitlements */,
    28822879                                1AA4792212A59FD9008236C3 /* PluginProcessMac.mm */,
    28832880                                1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */,
     
    29342931                                BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
    29352932                                BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */,
     2933                                5D442A5516D5856700AC3331 /* PluginService.entitlements */,
    29362934                                E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */,
    29372935                                5183B3931379F85C00E8754E /* Shim.xcconfig */,
     
    58495847                                BCDE093A13272496001259FB /* Sources */,
    58505848                                BCDE093C13272496001259FB /* Copy Plug-in Process Shim */,
    5851                                 E14E99FA14D879DB001D221F /* Add Entitlements */,
    58525849                                BC5D24B216CC3F3B007D5461 /* Frameworks */,
    58535850                        );
     
    61966193                        shellPath = /bin/sh;
    61976194                        shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\n\nexport WebKit2=\"${SRCROOT}\"\n\nif [ ! $CC ]; then\n    export CC=\"`xcrun -find clang`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    make --no-builtin-rules -f \"${WebKit2}/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu` SDKROOT=${SDKROOT}\nfi\n";
    6198                 };
    6199                 E14E99FA14D879DB001D221F /* Add Entitlements */ = {
    6200                         isa = PBXShellScriptBuildPhase;
    6201                         buildActionMask = 2147483647;
    6202                         files = (
    6203                         );
    6204                         inputPaths = (
    6205                         );
    6206                         name = "Add Entitlements";
    6207                         outputPaths = (
    6208                         );
    6209                         runOnlyForDeploymentPostprocessing = 0;
    6210                         shellPath = /bin/sh;
    6211                         shellScript = "PluginProcess/mac/add-entitlements.sh";
    6212                         showEnvVarsInLog = 0;
    62136195                };
    62146196/* End PBXShellScriptBuildPhase section */
Note: See TracChangeset for help on using the changeset viewer.