Cleanup remove mac specific type 'application'...

pylib/gyp/generator/xcode.py

 #!/usr/bin/python
 
 import filecmp
 import gyp.common
 import gyp.xcodeproj_file
 import errno
 import os
 import pprint
 import re
 import shutil
@@ skipping 457 matching lines @@
 
     # Set up the configurations for the target according to the list of names
     # supplied.
     xccl = gyp.xcodeproj_file.XCConfigurationList({'buildConfigurations': []})
     for configuration_name in configuration_names:
       xcbc = gyp.xcodeproj_file.XCBuildConfiguration({
           'name': configuration_name})
       xccl.AppendProperty('buildConfigurations', xcbc)
     xccl.SetProperty('defaultConfigurationName', configuration_names[0])
 
-    # Create an XCTarget subclass object for the target.
+    # Create an XCTarget subclass object for the target.  We use the type
+    # with "+bundle" append if the target has "mac_bundle" set.

[Mark Mentovai, 2009/03/19 18:22:50]

appended

     _types = {
-      'application':    'com.apple.product-type.application',
-      'executable':     'com.apple.product-type.tool',
-      'shared_library': 'com.apple.product-type.library.dynamic',
-      'static_library': 'com.apple.product-type.library.static',
+      'executable':        'com.apple.product-type.tool',
+      'shared_library':    'com.apple.product-type.library.dynamic',
+      'static_library':    'com.apple.product-type.library.static',
+      'executable+bundle': 'com.apple.product-type.application',
+      # TODO: add 'shared_library+bundle' -> Framework
     }
 
     target_properties = {
       'buildConfigurationList': xccl,
       'name':                   target_name,
     }
 
     type = spec['type']
     if type != 'none':
+      type_bundle_key = type
+      if spec.get('mac_bundle', 0):
+        type_bundle_key += '+bundle'
       xctarget_type = gyp.xcodeproj_file.PBXNativeTarget
-      target_properties['productType'] = _types[type]
+      target_properties['productType'] = _types[type_bundle_key]
     else:
       xctarget_type = gyp.xcodeproj_file.PBXAggregateTarget
 
     if 'product_name' in spec:
       target_properties['productName'] = spec['product_name']
 
     xct = xctarget_type(target_properties, parent=pbxp)
     pbxp.AppendProperty('targets', xct)
     xcode_targets[qualified_target] = xct
     xcode_target_to_target_dict[xct] = spec
@@ skipping 303 matching lines @@
     # Add "sources".
     for source in spec.get('sources', []):
       (source_root, source_extension) = os.path.splitext(source)
       if source_extension not in rules_by_ext:
         # AddSourceToTarget will add the file to a root group if it's not
         # already there.
         AddSourceToTarget(source, pbxp, xct)
       else:
         pbxp.AddOrGetFileInRootGroup(source)
 
-    # TODO(mark): Hard-coded to "application" now, but this should match any
-    # bundled type.
-    if spec['type'] == 'application':
-      # Add "mac_bundle_resources".
+    # Add "mac_bundle_resources" if it's a bundle of any type.
+    if spec.get('mac_bundle', 0):
       for resource in spec.get('mac_bundle_resources', []):
         AddResourceToTarget(resource, pbxp, xct)
 
     # Add "copies".
     for copy_group in spec.get('copies', []):
       pbxcp = gyp.xcodeproj_file.PBXCopyFilesBuildPhase({
             'name': 'Copy to ' + copy_group['destination']
           },
           parent=xct)
       pbxcp.SetDestination(copy_group['destination'])
@@ skipping 85 matching lines @@
 
   for build_file in build_files:
     xcode_projects[build_file].Finalize1(xcode_targets)
 
   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()