Make first_ids_file an optional attribute of the .grd file.

grit_info.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 '''Tool to determine inputs and outputs of a grit file.
 '''
 
 import optparse
 import os
 import posixpath
 import types
 import sys
 
 from grit import grd_reader
 from grit import util
 
 class WrongNumberOfArguments(Exception):
   pass
 
 
 def Outputs(filename, defines):
+  # TODO(joi@chromium.org): The first_ids_file can now be specified
+  # via an attribute on the <grit> node.  Once a change lands in
+  # WebKit to use this attribute, we can stop specifying the
+  # first_ids_file parameter here and instead specify it in all grd
+  # files.  For now, since Chrome is the only user of grit_info.py,
+  # this is fine.
   grd = grd_reader.Parse(
-      filename, defines=defines, tags_to_ignore=set(['messages']))
+      filename, defines=defines, tags_to_ignore=set(['messages']),
+      first_ids_file='GRIT_DIR/../gritsettings/resource_ids')
 
   target = []
   lang_folders = {}
   # Add all explicitly-specified output files
   for output in grd.GetOutputFiles():
     path = output.GetFilename()
     target.append(path)
 
     if path.endswith('.h'):
       path, filename = os.path.split(path)
@@ skipping 16 matching lines @@
   return [t.replace('\\', '/') for t in target]
 
 
 def GritSourceFiles():
   files = []
   grit_root_dir = os.path.relpath(os.path.dirname(__file__), os.getcwd())
   for root, dirs, filenames in os.walk(grit_root_dir):
     grit_src = [os.path.join(root, f) for f in filenames
                 if f.endswith('.py')]
     files.extend(grit_src)
-  # TODO(joi@chromium.org): Once we switch to specifying the
-  # resource_ids file via a .grd attribute, it should be considered an
-  # input of grit and this bit should no longer be necessary.
-  default_resource_ids = os.path.relpath(
-      os.path.join(grit_root_dir, '..', 'gritsettings', 'resource_ids'),
-      os.getcwd())
-  if os.path.exists(default_resource_ids):
-    files.append(default_resource_ids)
   return files
 
 
 def Inputs(filename, defines):
+  # TODO(joi@chromium.org): The first_ids_file can now be specified
+  # via an attribute on the <grit> node.  Once a change lands in
+  # WebKit to use this attribute, we can stop specifying the
+  # first_ids_file parameter here and instead specify it in all grd
+  # files.  For now, since Chrome is the only user of grit_info.py,
+  # this is fine.
   grd = grd_reader.Parse(
-      filename, debug=False, defines=defines, tags_to_ignore=set(['messages']))
+      filename, debug=False, defines=defines, tags_to_ignore=set(['messages']),
+      first_ids_file='GRIT_DIR/../gritsettings/resource_ids')
   files = []
   for node in grd:
     if (node.name == 'structure' or node.name == 'skeleton' or
         (node.name == 'file' and node.parent and
          node.parent.name == 'translations')):
       files.append(node.GetFilePath())
+    elif node.name == 'grit':
+      first_ids_file = node.GetFirstIdsFile()
+      if first_ids_file:
+        files.append(first_ids_file)
     elif node.name == 'include':
       # Only include files that we actually plan on using.
       if node.SatisfiesOutputCondition():
         files.append(node.FilenameToOpen())
         # If it's a flattened node, grab inlined resources too.
         if node.attrs['flattenhtml'] == 'true':
           files.extend(node.GetHtmlResourceFilenames())
 
   return files
 
@@ skipping 60 matching lines @@
   except WrongNumberOfArguments, e:
     PrintUsage()
     print e
     return 1
   print result
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))