GRIT: Enable variable expansion in filenames during HTML inlining.

grit/node/structure.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.
 
 '''The <structure> element.
 '''
 
 import os
 import platform
@@ skipping 75 matching lines @@
     gathertype = _GATHERERS[self.attrs['type']]
 
     self.gatherer = gathertype(self.attrs['file'],
                                self.attrs['name'],
                                self.attrs['encoding'])
     self.gatherer.SetGrdNode(self)
     self.gatherer.SetUberClique(self.UberClique())
     if hasattr(self.GetRoot(), 'defines'):
       self.gatherer.SetDefines(self.GetRoot().defines)
     self.gatherer.SetAttributes(self.attrs)
+    if self.ExpandVariables():
+      self.gatherer.SetFilenameExpansionFunction(self._Substitute)
 
     # Parse local variables and instantiate the substituter.
     if self.attrs['variables']:
       variables = self.attrs['variables']
       self.substituter = util.Substituter()
       self.substituter.AddSubstitutions(self._ParseVariables(variables))
 
     self.skeletons = {}  # Maps expressions to skeleton gatherers
     for child in self.children:
       assert isinstance(child, variant.SkeletonNode)
       skel = gathertype(child.attrs['file'],
                         self.attrs['name'],
                         child.GetEncodingToUse(),
                         is_skeleton=True)
       skel.SetGrdNode(self)  # TODO(benrg): Or child? Only used for ToRealPath
       skel.SetUberClique(self.UberClique())
+      if self.ExpandVariables():
+        skel.SetFilenameExpansionFunction(self._Substitute)

[flackr, 2013/06/06 14:07:19]

Hmm, we should be calling SetDefines here as well I think.

[dconnelly, 2013/06/07 09:10:38]

Done.

       self.skeletons[child.attrs['expr']] = skel
 
   def MandatoryAttributes(self):
     return ['type', 'name', 'file']
 
   def DefaultAttributes(self):
     return { 'encoding' : 'cp1252',
              'exclude_from_rc' : 'false',
              'line_end' : 'unix',
              'output_encoding' : 'utf-8',
@@ skipping 221 matching lines @@
   def SubstituteMessages(self, substituter):
     '''Propagates substitution to gatherer.
 
     Args:
       substituter: a grit.util.Substituter object.
     '''
     assert hasattr(self, 'gatherer')
     if self.ExpandVariables():
       self.gatherer.SubstituteMessages(substituter)