Xcode support for already-assembled .o (object) files as sources

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 473 matching lines @@
 
   # Pull out the Xcode version itself.
   match_line = re.search('^Xcode (.*)$', xcodebuild_version_info, re.MULTILINE)
   if match_line:
     cached_xcode_version = match_line.group(1)
   # Done!
   return cached_xcode_version
 
 
 def AddSourceToTarget(source, pbxp, xct):
-  # TODO(mark): Perhaps this can be made a little bit fancier.
+  # TODO(mark): Perhaps source_extensions and library_extensions can be made a
+  # little bit fancier.
   source_extensions = ['c', 'cc', 'cpp', 'cxx', 'm', 'mm', 's']
+
+  # .o is conceptually more of a "source" than a "library," but Xcode thinks
+  # of "sources" as things to compile and "libraries" (or "frameworks") as
+  # things to link with. Adding an object file to an Xcode target's frameworks
+  # phase works properly.
+  library_extensions = ['a', 'dylib', 'framework', 'o']
+
   basename = posixpath.basename(source)
   (root, ext) = posixpath.splitext(basename)
   if ext != '':
     ext = ext[1:].lower()
 
   if ext in source_extensions:
     xct.SourcesPhase().AddFile(source)
+  elif ext in library_extensions:
+    xct.FrameworksPhase().AddFile(source)
   else:
-    # Files that aren't added to a sources build phase can still go into
-    # the project file, just not as part of a build phase.
+    # Files that aren't added to a sources or frameworks build phase can still
+    # go into the project file, just not as part of a build phase.
     pbxp.AddOrGetFileInRootGroup(source)
 
 
 def AddResourceToTarget(resource, pbxp, xct):
   # TODO(mark): Combine with AddSourceToTarget above?  Or just inline this call
   # where it's used.
   xct.ResourcesPhase().AddFile(resource)
 
 
 _xcode_variable_re = re.compile('(\$\((.*?)\))')
@@ skipping 613 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()