Adds support for a new target spec: 'mac_xcuitest_bundle'. This allows us to create UI testing bund…

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 gyp.xcode_ninja
 import errno
 import os
@@ skipping 59 matching lines @@
 # configurations.
 generator_additional_non_configuration_keys = [
   'ios_app_extension',
   'ios_watch_app',
   'ios_watchkit_extension',
   'mac_bundle',
   'mac_bundle_resources',
   'mac_framework_headers',
   'mac_framework_private_headers',
   'mac_xctest_bundle',
+  'mac_xcuitest_bundle',
   'xcode_create_dependents_test_runner',
 ]
 
 # 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',
 ]
 
@@ skipping 594 matching lines @@
     # 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',
       'mac_kernel_extension':        'com.apple.product-type.kernel-extension',
       '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',
+      'loadable_module+xcuitest':    'com.apple.product-type.bundle.ui-testing',
       'shared_library+bundle':       'com.apple.product-type.framework',
       'executable+extension+bundle': 'com.apple.product-type.app-extension',
       'executable+watch+extension+bundle':
           'com.apple.product-type.watchkit-extension',
       'executable+watch+bundle':
           'com.apple.product-type.application.watchapp',
       'mac_kernel_extension+bundle': 'com.apple.product-type.kernel-extension',
     }
 
     target_properties = {
       'buildConfigurationList': xccl,
       'name':                   target_name,
     }
 
     type = spec['type']
     is_xctest = int(spec.get('mac_xctest_bundle', 0))
+    is_xcuitest = int(spec.get('mac_xcuitest_bundle', 0))
     is_bundle = int(spec.get('mac_bundle', 0)) or is_xctest
     is_app_extension = int(spec.get('ios_app_extension', 0))
     is_watchkit_extension = int(spec.get('ios_watchkit_extension', 0))
     is_watch_app = int(spec.get('ios_watch_app', 0))
     if type != 'none':
       type_bundle_key = type
-      if is_xctest:
+      if is_xcuitest:
+        type_bundle_key += '+xcuitest'
+        assert type == 'loadable_module', (
+            'mac_xcuitest_bundle targets must have type loadable_module '
+            '(target %s)' % target_name)
+      elif is_xctest:
         type_bundle_key += '+xctest'
         assert type == 'loadable_module', (
             'mac_xctest_bundle targets must have type loadable_module '
             '(target %s)' % target_name)
       elif is_app_extension:
         assert is_bundle, ('ios_app_extension flag requires mac_bundle '
             '(target %s)' % target_name)
         type_bundle_key += '+extension+bundle'
       elif is_watchkit_extension:
         assert is_bundle, ('ios_watchkit_extension flag requires mac_bundle '
@@ skipping 11 matching lines @@
         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_xcuitest, (
+          'mac_xcuitest_bundle targets cannot have type none (target "%s")' %
+          target_name)
       assert not is_xctest, (
           'mac_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'),
@@ skipping 533 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()