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

pylib/gyp/generator/ninja.py

Index: pylib/gyp/generator/ninja.py
===================================================================
--- pylib/gyp/generator/ninja.py	(revision 1746)
+++ pylib/gyp/generator/ninja.py	(working copy)
@@ -2113,7 +2113,33 @@
   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)