Make first_ids_file an optional attribute of the .grd file.

grit/grd_reader.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.
 
 '''Class for reading GRD files into memory, without processing them.
 '''
 
 import os.path
 import types
@@ skipping 90 matching lines @@
     if self.ignore_depth == 0:
       if self.stack[-1]:
         self.stack[-1].AppendContent(content)
 
   def ignorableWhitespace(self, whitespace):
     # TODO(joi)  This is not supported by expat.  Should use a different XML parser?
     pass
 
 
 def Parse(filename_or_stream, dir=None, flexible_root=False,
-          stop_after=None, debug=False, first_id_filename=None,
+          stop_after=None, first_ids_file=None, debug=False,
           defines=None, tags_to_ignore=None):
   '''Parses a GRD file into a tree of nodes (from grit.node).
 
   If flexible_root is False, the root node must be a <grit> element.  Otherwise
   it can be any element.  The "own" directory of the file will only be fixed up
   if the root node is a <grit> element.
 
   'dir' should point to the directory of the input file, or be the full path
   to the input file (the filename will be stripped).
 
   If 'stop_after' is provided, the parsing will stop once the first node
   with this name has been fully parsed (including all its contents).
 
   If 'debug' is true, lots of information about the parsing events will be
   printed out during parsing of the file.
 
-  If first_id_filename is provided, then we use the provided path instead of
-  resources_id to gather the first id values for resources.
+  If 'first_ids_file' is non-empty, it is used to override the setting
+  for the first_ids_file attribute of the <grit> root node.
 
   Args:
     filename_or_stream: './bla.xml'  (must be filename if dir is None)
     dir: '.' or None (only if filename_or_stream is a filename)
     flexible_root: True | False
     stop_after: 'inputs'
+    first_ids_file: 'GRIT_DIR/../gritsettings/resource_ids'
     debug: False
-    first_id_filename: None
     defines: dictionary of defines, like {'chromeos': '1'}
 
   Return:
     Subclass of grit.node.base.Node
 
   Throws:
     grit.exception.Parsing
   '''
   handler = GrdContentHandler(stop_after=stop_after, debug=debug,
                               defines=defines, tags_to_ignore=tags_to_ignore)
   try:
     xml.sax.parse(filename_or_stream, handler)
   except StopParsingException:
     assert stop_after
     pass
   except:
     if not debug:
       print "parse exception: run GRIT with the -x flag to debug .grd problems"
     raise
 
   if not flexible_root or hasattr(handler.root, 'SetOwnDir'):
     assert isinstance(filename_or_stream, types.StringType) or dir != None
     if not dir:
       dir = util.dirname(filename_or_stream)
       if len(dir) == 0:
         dir = '.'
     # Fix up the base_dir so it is relative to the input file.
     handler.root.SetOwnDir(dir)
 
-  # Assign first ids to the nodes that don't have them.
-  if isinstance(handler.root, misc.GritNode) and first_id_filename != '':
-    handler.root.AssignFirstIds(filename_or_stream, first_id_filename, defines)
+  if isinstance(handler.root, misc.GritNode):
+    if first_ids_file:
+      handler.root.attrs['first_ids_file'] = first_ids_file
+    # Assign first ids to the nodes that don't have them.
+    handler.root.AssignFirstIds(filename_or_stream, defines)
 
   return handler.root
 
 
 if __name__ == '__main__':
   util.ChangeStdoutEncoding()
   print unicode(Parse(sys.argv[1]))