Teach sort-headers.py about windows.h.

tools/sort-headers.py

 #!/usr/bin/python
 
 """Given a filename as an argument, sort the #include/#imports in that file.
 
 Shows a diff and prompts for confirmation before doing the deed.
 """
 
 import optparse
 import os
 import sys
@@ skipping 16 matching lines @@
   print ch
   return ch in ('Y', 'y')
 
 
 def IncludeCompareKey(line):
   """Sorting comparator key used for comparing two #include lines.
   Returns the filename without the #include/#import prefix.
   """
   for prefix in ('#include ', '#import '):
     if line.startswith(prefix):
-      return line[len(prefix):]
+      line = line[len(prefix):]
+      break
+  # <windows.h> needs to be before other includes, so return a key
+  # that's less than all other keys.
+  if line.find('<windows.h>') != -1:

[Evan Martin, 2011/05/19 20:04:33]

Maybe test .startswith() instead?  (will catch the possibly nonexistent corner
case of 
  #include "foo.h"  // blah blah <windows.h>

[Nico, 2011/05/19 20:06:21]

Done. (lstrip().startswith() if someone accidentally two spaces)

+    return ''
   return line
 
 
 def IsInclude(line):
   """Returns True if the line is an #include/#import line."""
   return line.startswith('#include ') or line.startswith('#import ')
 
 
 def SortHeader(infile, outfile):
   """Sorts the headers in infile, writing the sorted file to outfile."""
@@ skipping 37 matching lines @@
     finally:
       try:
         os.remove(fixfilename)
       except OSError:
         # If the file isn't there, we don't care.
         pass
 
 
 if __name__ == '__main__':
   main()