Make loadable_modules without mac_bundle buildable

trunk/pylib/gyp/generator/xcode.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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
@@ skipping 579 matching lines @@
     for configuration_name in sorted(spec['configurations'].keys()):
       if configuration_name not in configuration_names:
         configuration_names.append(configuration_name)
     xcp = xcode_projects[build_file]
     pbxp = xcp.project
 
     # Set up the configurations for the target according to the list of names
     # supplied.
     xccl = CreateXCConfigurationList(configuration_names)
 
-    # Create an XCTarget subclass object for the target.  We use the type
-    # with "+bundle" appended if the target has "mac_bundle" set.
+    # Create an XCTarget subclass object for the target. The type with
+    # "+bundle" appended will be used if the target has "mac_bundle" set.
+    # 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.apple.product-type.library.dynamic',
+      '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',
       'shared_library+bundle':  'com.apple.product-type.framework',
     }
 
     target_properties = {
       'buildConfigurationList': xccl,
       'name':                   target_name,
@@ skipping 20 matching lines @@
       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)
     xcode_targets[qualified_target] = xct
     xcode_target_to_target_dict[xct] = spec
 
-    # Xcode does not have a distinct type for loadable_modules that are pure
-    # BSD targets (ie-unbundled). It uses the same setup as a shared_library
-    # but the mach-o type is explictly set in the settings.  So before we do
-    # anything else, for this one case, we stuff in that one setting.  This
-    # would allow the other data in the spec to change it if need be.
-    if type == 'loadable_module' and not is_bundle:
-      xccl.SetBuildSetting('MACH_O_TYPE', 'mh_bundle')
-
     spec_actions = spec.get('actions', [])
     spec_rules = spec.get('rules', [])
 
     # Xcode has some "issues" with checking dependencies for the "Compile
     # sources" step with any source files/headers generated by actions/rules.
     # To work around this, if a target is building anything directly (not
     # type "none"), then a second target as used to run the GYP actions/rules
     # and is made a dependency of this target.  This way the work is done
     # before the dependency checks for what should be recompiled.
     support_xct = None
@@ skipping 471 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()