Add chrome_html gatherer, which inlines html and automatically generates image set…

grit/format/data_pack.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.
 
 '''Support for formatting a data pack file used for platform agnostic resource
 files.
 '''
 
 import exceptions
 import os
 import struct
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 from grit.format import interface
 from grit.node import include
 from grit.node import message
+from grit.node import structure
 from grit.node import misc
 
 
 PACK_FILE_VERSION = 4
 HEADER_LENGTH = 2 * 4 + 1  # Two uint32s. (file version, number of entries) and
                            # one uint8 (encoding of text resources)
 BINARY, UTF8, UTF16 = range(3)
 
 class WrongFileVersion(Exception):
   pass
 
 class DataPackContents:
   def __init__(self, resources, encoding):
     self.resources = resources
     self.encoding = encoding
 
 class DataPack(interface.ItemFormatter):
   '''Writes out the data pack file format (platform agnostic resource file).'''
   def Format(self, item, lang='en', output_dir='.'):
     assert isinstance(item, misc.ReleaseNode)
 
     nodes = DataPack.GetDataNodes(item)
     data = {}
     for node in nodes:
       id, value = node.GetDataPackPair(lang, UTF8)
-      data[id] = value
+      if value is not None:
+        data[id] = value
     return DataPack.WriteDataPackToString(data, UTF8)
 
   @staticmethod
   def GetDataNodes(item):
     '''Returns a list of nodes that can be packed into the data pack file.'''
     nodes = []
     if (isinstance(item, misc.IfNode) and not item.IsConditionSatisfied()):
       return nodes
     if (isinstance(item, include.IncludeNode) or
-        isinstance(item, message.MessageNode)):
+        isinstance(item, message.MessageNode) or
+        isinstance(item, structure.StructureNode)):
       # Include this node if it wasn't marked as skipped by a whitelist.
       if not item.WhitelistMarkedAsSkip():
         return [item]
       return nodes
     for child in item.children:
       nodes.extend(DataPack.GetDataNodes(child))
     return nodes
 
   @staticmethod
   def ReadDataPack(input_file):
@@ skipping 99 matching lines @@
   else:
     # Just write a simple file.
     data = { 1: "", 4: "this is id 4", 6: "this is id 6", 10: "" }
     DataPack.WriteDataPack(data, "datapack1.pak", UTF8)
     data2 = { 1000: "test", 5: "five" }
     DataPack.WriteDataPack(data2, "datapack2.pak", UTF8)
     print "wrote datapack1 and datapack2 to current directory."
 
 if __name__ == '__main__':
   main()