ninja/mac: Create -iphoneos device builds for iOS ninja generator.

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 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.
 
 import copy
 import hashlib
 import multiprocessing
 import os.path
 import re
 import signal
@@ skipping 2095 matching lines @@
 
 def CallGenerateOutputForConfig(arglist):
   # Ignore the interrupt signal so that the parent process catches it and
   # kills all multiprocessing children.
   signal.signal(signal.SIGINT, signal.SIG_IGN)
 
   (target_list, target_dicts, data, params, config_name) = arglist
   GenerateOutputForConfig(target_list, target_dicts, data, params, config_name)
 
 
+def TargetsHaveIOS(targets):
+  for target_name, target_dict in targets.items():
+    for config_name in target_dict['configurations'].keys():

[Nico, 2013/10/04 05:11:10]

Omit ".keys()", iterating a dict iterates the keys.

…but you only use the key to get at the value, so maybe iterate over .values()?

[justincohen, 2013/10/04 13:51:52]

Done.

+      config = target_dict['configurations'][config_name]
+      settings = config.get('xcode_settings', None)

[Nico, 2013/10/04 05:11:10]

None is the default for get, you can omit it

– but if you use {} as default you don't need the "if settings" check in the
next line

[justincohen, 2013/10/04 13:51:52]

Done.

+      if settings and settings.get('IPHONEOS_DEPLOYMENT_TARGET', None):
+        return True
+  return False
+
+
+def UpdateIOSDeviceConfigurations(targets):
+  for target_name, target_dict in targets.items():
+    for config_name in target_dict['configurations'].keys():
+      config = target_dict['configurations'][config_name]
+      new_config_name = config_name+'-iphoneos'

[Nico, 2013/10/04 05:11:10]

spaces around +

[justincohen, 2013/10/04 13:51:52]

Done.

+      new_config_dict = copy.deepcopy(config)

[Nico, 2013/10/04 05:11:10]

How much does this slow down gyp?

[justincohen, 2013/10/04 13:51:52]

For Chrome for iOS, GenerateOutput is called 736 times, and each deepcopy takes
about 0.0004, which adds up to about an extra 0.32 seconds.  So not much.

In the end it adds up to On 2013/10/04 05:11:10, Nico wrote:

+      if target_dict['toolset'] == 'target':
+        new_config_dict['xcode_settings']['ARCHS'] = ['armv7']
+        new_config_dict['xcode_settings']['SDKROOT'] = 'iphoneos'
+      target_dict['configurations'][new_config_name] = new_config_dict
+  return targets
+
 def GenerateOutput(target_list, target_dicts, data, params):

[Nico, 2013/10/04 05:11:10]

call xcode_emulation.CloneConfigurationsForDeviceAndEmulator(targets) here, and
move the remaining code in this cl into xcode_emulation. Add docstrings to your
new functions.

(the if statement should be in CloneConfigurationsForDeviceAndEmulator too)

[justincohen, 2013/10/04 13:51:52]

Done.

+  # Update target_dicts for iOS device builds.
+  if TargetsHaveIOS(target_dicts):
+    target_dicts = UpdateIOSDeviceConfigurations(target_dicts)
+
   user_config = params.get('generator_flags', {}).get('config', None)
   if gyp.common.GetFlavor(params) == 'win':
     target_list, target_dicts = MSVSUtil.ShardTargets(target_list, target_dicts)
     target_list, target_dicts = MSVSUtil.InsertLargePdbShims(
         target_list, target_dicts, generator_default_variables)
 
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     if params['parallel']:
       try:
         pool = multiprocessing.Pool(len(config_names))
         arglists = []
         for config_name in config_names:
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
         pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)