Sort file refs and build refs by UUID so Xcode doesn't resort them on...

tools/xcodebodge/xcodebodge.py

 #!/usr/bin/python
 # Copyright (c) 2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """
 Commandline modification of Xcode project files
 """
 
 import sys
 import os
@@ skipping 534 matching lines @@
         # Only files are sorted, they keep groups at the top
         try:
           self.FileReferenceForUUID(parent_group.child_uuids[i])
           if new_file_ref.name.lower() < parent_group.child_names[i].lower():
             break
         except RuntimeError:
           pass  # Must be a child group
         i += 1
       parent_group.child_names.insert(i, new_file_ref.name)
       parent_group.child_uuids.insert(i, new_file_ref.uuid)
+      # Add file ref uuid sorted
       self._sections['PBXFileReference'].append(new_file_ref)
+      self._sections['PBXFileReference'].sort(cmp=lambda x,y: cmp(x.uuid, y.uuid))

[sgk, 2009/01/26 18:53:01]

Nit:  80 chars.

       return new_file_ref
 
     # Group-relative failed, how about SOURCE_ROOT relative in the main group
     src_rel_path = self.RelativeSourceRootPath(os.path.abspath(path))
     if src_rel_path:
       src_rel_path = src_rel_path.replace('\\', '/')  # Convert to Unix
       new_file_ref = PBXFileReference(NewUUID(),
                                       os.path.basename(path),
                                       source_type,
                                       None,
                                       src_rel_path,
                                       'SOURCE_ROOT',
                                       None)
       self._root_group.child_uuids.append(new_file_ref.uuid)
       self._root_group.child_names.append(new_file_ref.name)
+      # Add file ref uuid sorted
       self._sections['PBXFileReference'].append(new_file_ref)
+      self._sections['PBXFileReference'].sort(cmp=lambda x,y: cmp(x.uuid, y.uuid))

[sgk, 2009/01/26 18:53:01]

Nit:  80 chars.

       return new_file_ref
 
     # Win to Unix absolute paths probably not practical
     raise RuntimeError('Could not construct group or source PBXFileReference '
                        'for path "%s"' % path)
 
   def AddSourceFileToSourcesBuildPhase(self, source_ref, source_phase):
     """Add a PBXFileReference to a PBXSourcesBuildPhase, creating a new
     PBXBuildFile as needed.
 
     Args:
       source_ref: PBXFileReference instance appropriate for use in
                   PBXSourcesBuildPhase
       source_phase: PBXSourcesBuildPhase instance
     """
     # Prevent duplication
     for source_uuid in source_phase.file_uuids:
       build_file = self.BuildFileForUUID(source_uuid)
       if build_file.file_ref_uuid == source_ref.uuid:
         return
     # Create PBXBuildFile
     new_build_file = PBXBuildFile(NewUUID(),
                                   source_ref.name,
                                   'Sources',
                                   source_ref.uuid,
                                   '')
+    # Add to build file list (uuid sorted)
     self._sections['PBXBuildFile'].append(new_build_file)
+    self._sections['PBXBuildFile'].sort(cmp=lambda x,y: cmp(x.uuid, y.uuid))
     # Add to sources phase list (name sorted)
     i = 0
     while i < len(source_phase.file_names):
       if source_ref.name.lower() < source_phase.file_names[i].lower():
         break
       i += 1
     source_phase.file_names.insert(i, new_build_file.name)
     source_phase.file_uuids.insert(i, new_build_file.uuid)
 
 
@@ skipping 648 matching lines @@
   elif args[0] == 'parse_sanity':
     if ''.join(project.FileContent()) != ''.join(project._raw_content):
       option_parser.error('Project rewrite sanity fail "%s"' % project.path)
     
   else:
     Usage(option_parser)
 
 
 if __name__ == '__main__':
   Main()