ninja/mac: Add iOS fields to ExtraPlistItems 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
@@ skipping 774 matching lines @@
     # Convert that to '0463', '4H1503'.
     version_list = self._GetStdout(['xcodebuild', '-version']).splitlines()
     version = version_list[0]
     build = version_list[-1]
     # Be careful to convert "4.2" to "0420":
     version = version.split()[-1].replace('.', '')
     version = (version + '0' * (3 - len(version))).zfill(4)
     build = build.split()[-1]
     return version, build
 
+  def _XcodeIOSDeviceFamily(self, configname):
+    family = self.xcode_settings[configname].get('TARGETED_DEVICE_FAMILY')

[Nico, 2013/10/11 20:20:49]

return self.xcode_settings[configname].get('TARGETED_DEVICE_FAMILY',
'1').split(',')

[justincohen, 2013/10/12 14:52:28]

Almost, I needed to add an int(x) for x in foo.  PTAL.

On 2013/10/11 20:20:49, Nico wrote:

+    if family == '1,2':
+      return [1,2]
+    elif family == '2':
+      return [2]
+    return [1]
+
   def GetExtraPlistItems(self, configname=None):
     """Returns a dictionary with extra items to insert into Info.plist."""
-    if not XcodeSettings._plist_cache:
-      cache = XcodeSettings._plist_cache
+    if configname not in XcodeSettings._plist_cache:
+      cache = {}
       cache['BuildMachineOSBuild'] = self._BuildMachineOSBuild()
 
       xcode, xcode_build = self._XcodeVersion()
       cache['DTXcode'] = xcode
       cache['DTXcodeBuild'] = xcode_build
 
       sdk_root = self._SdkRoot(configname)
       cache['DTSDKName'] = sdk_root
       if xcode >= '0430':
         cache['DTSDKBuild'] = self._GetSdkVersionInfoItem(
             sdk_root, 'ProductBuildVersion')
       else:
         cache['DTSDKBuild'] = cache['BuildMachineOSBuild']
 
-    return XcodeSettings._plist_cache
+      if self.isIOS:
+        cache['UIDeviceFamily'] = self._XcodeIOSDeviceFamily(configname)
+        if configname.endswith("iphoneos"):
+          cache['CFBundleSupportedPlatforms'] = ['iPhoneOS']
+        else:
+          cache['CFBundleSupportedPlatforms'] = ['iPhoneSimulator']
+      XcodeSettings._plist_cache[configname] = cache
+    return XcodeSettings._plist_cache[configname]
 
 
 class MacPrefixHeader(object):
   """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
 
   This feature consists of several pieces:
   * If GCC_PREFIX_HEADER is present, all compilations in that project get an
     additional |-include path_to_prefix_header| cflag.
   * If GCC_PRECOMPILE_PREFIX_HEADER is present too, then the prefix header is
     instead compiled, and all other compilations in the project get an
@@ skipping 392 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