chrome_resources take 2

tools/grit/grit/scons.py

 #!/usr/bin/python2.4
 # Copyright (c) 2006-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.
 
 '''SCons integration for GRIT.
 '''
 
 # NOTE:  DO NOT IMPORT ANY GRIT STUFF HERE - we import lazily so that grit and
 # its dependencies aren't imported until actually needed.
@@ skipping 66 matching lines @@
   # TODO(gspencer):  Had to use .abspath, not str(target[0]), to get
   # this to work with Repository() directories.
   # Get this functionality folded back into the upstream grit tool.
   #base_dir = util.dirname(str(target[0]))
   base_dir = util.dirname(target[0].abspath)
 
   grd = grd_reader.Parse(_SourceToFile(source), debug=_IsDebugEnabled())
 
   target = []
   lang_folders = {}
+  # TODO(tc): new_header_output is a hack while we migrate to
+  # grit_derived_sources/grit/ as the new output dir for headers.
+  new_header_output = None
   # Add all explicitly-specified output files
   for output in grd.GetOutputFiles():
     path = os.path.join(base_dir, output.GetFilename())
     target.append(path)
+
+    if path.endswith('.h'):
+      path, filename = os.path.split(path)
+      new_header_output = os.path.join(path, 'grit', filename)
     if _IsDebugEnabled():
       print "GRIT: Added target %s" % path
     if output.attrs['lang'] != '':
       lang_folders[output.attrs['lang']] = os.path.dirname(path)
 
   # Add all generated files, once for each output language.
   for node in grd:
     if node.name == 'structure':
       # TODO(joi) Should remove the "if sconsdep is true" thing as it is a
       # hack - see grit/node/structure.py
       if node.HasFileForLanguage() and node.attrs['sconsdep'] == 'true':
         for lang in lang_folders:
           path = node.FileForLanguage(lang, lang_folders[lang],
                                       create_file=False,
                                       return_if_not_generated=False)
           if path:
             target.append(path)
             if _IsDebugEnabled():
               print "GRIT: Added target %s" % path
 
+  if new_header_output:
+    target.append(new_header_output)
+
   # GRIT is not thread safe so we should only build one grit target at a time. 
   # We tell scons about this by making a fake side effect target.
   env.SideEffect('grit_lock', target)
 
   # return target and source lists
   return (target, source)
 
 
 def _Scanner(file_node, env, path):
   '''A SCons scanner function for .grd files, which outputs the list of files
@@ skipping 49 matching lines @@
   builder = env.Builder(action=action, emitter=_Emitter,
                         source_scanner=scanner,
                         src_suffix='.grd')
 
   # add our builder and scanner to the environment
   env.Append(BUILDERS = {'GRIT': builder})
 
 # Function name is mandated by newer versions of SCons.
 def exists(env):
   return 1