Adds generator support for Xcode 5 xctest targets.

pylib/gyp/generator/xcode.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.
 
 import filecmp
 import gyp.common
 import gyp.xcodeproj_file
 import errno
 import os
 import sys
@@ skipping 55 matching lines @@
 ]
 
 # The Xcode-specific keys that exist on targets and aren't moved down to
 # configurations.
 generator_additional_non_configuration_keys = [
   'mac_bundle',
   'mac_bundle_resources',
   'mac_framework_headers',
   'mac_framework_private_headers',
   'xcode_create_dependents_test_runner',
+  'xctest_bundle',
 ]
 
 # We want to let any rules apply to files that are resources also.
 generator_extra_sources_for_rules = [
   'mac_bundle_resources',
   'mac_framework_headers',
   'mac_framework_private_headers',
 ]
 
 # Xcode's standard set of library directories, which don't need to be duplicated
@@ skipping 549 matching lines @@
     # loadable_modules not in a mac_bundle are mapped to
     # com.googlecode.gyp.xcode.bundle, a pseudo-type that xcode.py interprets
     # to create a single-file mh_bundle.
     _types = {
       'executable':             'com.apple.product-type.tool',
       'loadable_module':        'com.googlecode.gyp.xcode.bundle',
       'shared_library':         'com.apple.product-type.library.dynamic',
       'static_library':         'com.apple.product-type.library.static',
       'executable+bundle':      'com.apple.product-type.application',
       'loadable_module+bundle': 'com.apple.product-type.bundle',
+      'loadable_module+xctest': 'com.apple.product-type.bundle.unit-test',
       'shared_library+bundle':  'com.apple.product-type.framework',
     }
 
     target_properties = {
       'buildConfigurationList': xccl,
       'name':                   target_name,
     }
 
     type = spec['type']
     is_bundle = int(spec.get('mac_bundle', 0))

[Mark Mentovai, 2013/10/30 21:31:16]

The name mac_bundle was chosen because platform-specific things like this are
named with a platform prefix (like how generator-specific things are named with
generator prefixes). This is a huge help in cross-platform projects.

xctest_bundle, by contrast, doesn’t make as much sense from a self-documentation
perspective in a cross-platform project. The name according to existing GYP
usage would be better as 'mac_xctest', or perhaps 'mac_xctest_bundle'.

[jonwall, 2013/10/30 22:03:15]

Done.

+    is_xctest = int(spec.get('xctest_bundle', 0))
     if type != 'none':
       type_bundle_key = type
-      if is_bundle:
+      if is_xctest:
+        type_bundle_key += '+xctest'
+        assert type == 'loadable_module', (
+            'xctest_bundle targets must have type loadable_module (target %s)' %
+            target_name)
+      elif is_bundle:
         type_bundle_key += '+bundle'
+
       xctarget_type = gyp.xcodeproj_file.PBXNativeTarget
       try:
         target_properties['productType'] = _types[type_bundle_key]
       except KeyError, e:
         gyp.common.ExceptionAppend(e, "-- unknown product type while "
                                    "writing target %s" % target_name)
         raise
     else:
       xctarget_type = gyp.xcodeproj_file.PBXAggregateTarget
       assert not is_bundle, (
           'mac_bundle targets cannot have type none (target "%s")' %
           target_name)
+      assert not is_xctest, (
+          'xctest_bundle targets cannot have type none (target "%s")' %
+          target_name)
 
     target_product_name = spec.get('product_name')
     if target_product_name is not None:
       target_properties['productName'] = target_product_name
 
     xct = xctarget_type(target_properties, parent=pbxp,
                         force_outdir=spec.get('product_dir'),
                         force_prefix=spec.get('product_prefix'),
                         force_extension=spec.get('product_extension'))
     pbxp.AppendProperty('targets', xct)
@@ skipping 80 matching lines @@
       if int(action.get('process_outputs_as_sources', False)):
         for output in action['outputs']:
           AddSourceToTarget(output, type, pbxp, xct)
 
       if int(action.get('process_outputs_as_mac_bundle_resources', False)):
         for output in action['outputs']:
           AddResourceToTarget(output, pbxp, xct)
 
     # tgt_mac_bundle_resources holds the list of bundle resources so
     # the rule processing can check against it.
     if is_bundle:

[Mark Mentovai, 2013/10/30 21:31:16]

It’s still possible for something to be both xctest and bundle to get things
like mac_bundle_resources here. That’s fine by me, but do you think it might
make sense to have all of these other is_bundle-related things also be turned on
for xctests that don’t explicitly specify that they’re mac_bundles?

[jonwall, 2013/10/30 22:03:15]

Done - hopefully I understood your intention here?

       tgt_mac_bundle_resources = spec.get('mac_bundle_resources', [])
     else:
       tgt_mac_bundle_resources = []
 
     # Add custom shell script phases driving "make" for "rules" sections.
     #
     # Xcode's built-in rule support is almost powerful enough to use directly,
     # but there are a few significant deficiencies that render them unusable.
     # There are workarounds for some of its inadequacies, but in aggregate,
     # the workarounds added complexity to the generator, and some workarounds
@@ skipping 421 matching lines @@
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests)
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize2(xcode_targets,
                                          xcode_target_to_target_dict)
 
   for build_file in build_files:
     xcode_projects[build_file].Write()