ninja/mac: Support iOS codesign for ninja builds.

pylib/gyp/xcode_emulation.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This module contains classes that help to emulate xcodebuild behavior on top of
 other build systems, such as make and ninja.
 """
 
 import copy
 import gyp.common
 import os.path
 import re
 import shlex
 import subprocess
 import sys
 from gyp.common import GypError
 
 class XcodeSettings(object):
   """A class that understands the gyp 'xcode_settings' object."""
 
   # Populated lazily by _SdkPath(). Shared by all XcodeSettings, so cached
   # at class-level for efficiency.
   _sdk_path_cache = {}
 
   # Populated lazily by GetExtraPlistItems(). Shared by all XcodeSettings, so
   # cached at class-level for efficiency.
   _plist_cache = {}
 
+  # Populated lazily by GetIOSPostbuilds.  Shared by all XcodeSettings, so
+  # cached at class-level for efficiency.
+  _codesigning_key_cache = {}
+
   def __init__(self, spec):
     self.spec = spec
 
     self.isIOS = False
 
     # Per-target 'xcode_settings' are pushed down into configs earlier by gyp.
     # This means self.xcode_settings[config] always contains all settings
     # for that config -- the per-target settings as well. Settings that are
     # the same for all configs are implicitly per-target settings.
     self.xcode_settings = {}
     configs = spec['configurations']
     for configname, config in configs.iteritems():
       self.xcode_settings[configname] = config.get('xcode_settings', {})
+      self._ConvertConditionalKeys(configname)
       if self.xcode_settings[configname].get('IPHONEOS_DEPLOYMENT_TARGET',
                                              None):
         self.isIOS = True
 
-      # If you need this, speak up at http://crbug.com/122592
-      conditional_keys = [key for key in self.xcode_settings[configname]
-                          if key.endswith(']')]
-      if conditional_keys:
-        print 'Warning: Conditional keys not implemented, ignoring:', \
-              ' '.join(conditional_keys)
-        for key in conditional_keys:
-          del self.xcode_settings[configname][key]
-
     # This is only non-None temporarily during the execution of some methods.
     self.configname = None
 
     # Used by _AdjustLibrary to match .a and .dylib entries in libraries.
     self.library_re = re.compile(r'^lib([^/]+)\.(a|dylib)$')
 
+  def _ConvertConditionalKeys(self, configname):

[Nico, 2013/10/15 02:12:57]

docstring

[justincohen, 2013/10/15 16:47:33]

Done.

+    settings = self.xcode_settings[configname]
+    conditional_keys = [key for key in settings if key.endswith(']')]
+    for key in conditional_keys:
+        # If you need more, speak up at http://crbug.com/122592

[Nico, 2013/10/15 02:12:57]

indented too far

[justincohen, 2013/10/15 16:47:33]

Done.

+        if key.endswith("[sdk=iphoneos*]"):
+          if configname.endswith("iphoneos"):
+            new_key = key.split("[")[0]
+            settings[new_key] = settings[key]
+        else:
+          print 'Warning: Conditional keys not implemented, ignoring:', \
+                ' '.join(conditional_keys)
+        del settings[key]
+
   def _Settings(self):
     assert self.configname
     return self.xcode_settings[self.configname]
 
   def _Test(self, test_key, cond_key, default):
     return self._Settings().get(test_key, default) == cond_key
 
   def _Appendf(self, lst, test_key, format_str, default=None):
     if test_key in self._Settings():
       lst.append(format_str % str(self._Settings()[test_key]))
@@ skipping 665 matching lines @@
         self._Test(
             'DEBUG_INFORMATION_FORMAT', 'dwarf-with-dsym', default='dwarf') and
         self.spec['type'] != 'static_library'):
       if not quiet:
         result.append('echo DSYMUTIL\\(%s\\)' % self.spec['target_name'])
       result.append('dsymutil %s -o %s' % (output_binary, output + '.dSYM'))
 
     self.configname = None
     return result
 
   def GetTargetPostbuilds(self, configname, output, output_binary, quiet=False):

[Nico, 2013/10/15 02:12:57]

Can you  change make.py to call AddImplicitPostbuilds() too and then make this
private (i.e. prepend a '_')?

[justincohen, 2013/10/15 16:47:33]

Done.

     """Returns a list of shell commands that contain the shell commands
     to run as postbuilds for this target, before the actual postbuilds."""
     # dSYMs need to build before stripping happens.
     return (
         self._GetDebugInfoPostbuilds(configname, output, output_binary, quiet) +
         self._GetStripPostbuilds(configname, output_binary, quiet))
 
+  def _GetIOSPostbuilds(self, configname, is_app, output_binary):
+    """Return a shell command to codesign the iOS output binary so it can
+    be deployed to a device.  This should be run as the very last step of the
+    build."""
+    if not (self.isIOS and is_app):

[Nico, 2013/10/15 02:12:57]

this can read self.spec['type'], no need to for the is_app parameter

[justincohen, 2013/10/15 16:47:33]

Done.

+      return []
+
+    self.configname = configname
+    identity = self._Settings().get('CODE_SIGN_IDENTITY')
+    if identity == None:
+      return []

[Nico, 2013/10/15 02:12:57]

now self.configname is wrong

[Nico, 2013/10/15 02:33:27]

Also, setting this to "" (the empty string) apparently disables code signing, so
'' might be a better default value than None

[justincohen, 2013/10/15 16:47:33]

Done.

[justincohen, 2013/10/15 16:47:33]

Done

On 2013/10/15 02:33:27, Nico wrote:

+    if identity not in XcodeSettings._codesigning_key_cache:
+      proc = subprocess.Popen(['security', 'find-identity', '-p', 'codesigning',
+                               '-v'], stdout=subprocess.PIPE)

[Nico, 2013/10/15 02:19:29]

why -v here?

[Nico, 2013/10/15 02:22:28]

Ignore this, I misread the man page for `security`.

[justincohen, 2013/10/15 16:47:33]

Done.

[justincohen, 2013/10/15 16:47:33]

Done.

+      output = proc.communicate()[0].strip()
+      key = None
+      for item in output.split("\n"):
+        if identity in item:
+          assert key == None, (
+              "Multiple codesigning identities for identity: %s" %
+              identity)
+          key = item.split(' ')[1]
+      XcodeSettings._codesigning_key_cache[identity] = key
+    self.configname = None
+    key = XcodeSettings._codesigning_key_cache[identity]
+    if key:
+      return ["/usr/bin/codesign -v --force --sign %s %s" %

[Nico, 2013/10/15 02:12:57]

the rest of this file uses ' quotes

why "/usr/bin"?

why "-v"? do you want "--verify"? (`man codesign`: "if other actions (sign,
display, etc.) are also requested, -v is interpreted to mean --verbose.", and I
think you have --sign here)

[justincohen, 2013/10/15 16:47:33]

Yeah, it was as verbose.  I removed it.

On 2013/10/15 02:12:57, Nico wrote:

+          (key, output_binary)]
+    return []
+
+  def AddImplicitPostbuilds(self, configname, is_app, output, output_binary,
+                            postbuilds, quiet=False):

[Nico, 2013/10/15 02:12:57]

docstring

[justincohen, 2013/10/15 16:47:33]

Done.

+    assert output_binary is not None
+    pre = self.GetTargetPostbuilds(configname, output, output_binary, quiet)
+    post = self._GetIOSPostbuilds(configname, is_app, output_binary)
+    return (pre + postbuilds + post)

[Nico, 2013/10/15 02:12:57]

no parens

[justincohen, 2013/10/15 16:47:33]

Done.

+
   def _AdjustLibrary(self, library, config_name=None):
     if library.endswith('.framework'):
       l = '-framework ' + os.path.splitext(os.path.basename(library))[0]
     else:
       m = self.library_re.match(library)
       if m:
         l = '-l' + m.group(1)
       else:
         l = library
     return l.replace('$(SDKROOT)', self._SdkPath(config_name))
@@ skipping 462 matching lines @@
         new_config_dict['xcode_settings']['SDKROOT'] = 'iphoneos'
       target_dict['configurations'][new_config_name] = new_config_dict
   return targets
 
 def CloneConfigurationForDeviceAndEmulator(target_dicts):
   """If |target_dicts| contains any iOS targets, automatically create -iphoneos
   targets for iOS device builds."""
   if _HasIOSTarget(target_dicts):
     return _AddIOSDeviceConfigurations(target_dicts)
   return target_dicts