Reland of grit: Automatically replace ... with …

tools/grit/grit/tool/build.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 'grit build' tool along with integration for this tool with the
 SCons build system.
 '''
 
 import codecs
 import filecmp
 import getopt
 import os
 import shutil
 import sys
 
 from grit import grd_reader
+from grit import shortcuts
 from grit import util
+from grit.node import include
+from grit.node import message
+from grit.node import structure
 from grit.tool import interface
-from grit import shortcuts
 
 
 # It would be cleaner to have each module register itself, but that would
 # require importing all of them on every run of GRIT.
 '''Map from <output> node types to modules under grit.format.'''
 _format_modules = {
   'android':                  'android_xml',
   'c_format':                 'c_format',
   'chrome_messages_json':     'chrome_messages_json',
   'data_package':             'data_pack',
@@ skipping 107 matching lines @@
     first_ids_file = None
     whitelist_filenames = []
     assert_output_files = []
     target_platform = None
     depfile = None
     depdir = None
     rc_header_format = None
     output_all_resource_defines = None
     write_only_new = False
     depend_on_stamp = False
+    replace_ellipsis = True
     (own_opts, args) = getopt.getopt(args, 'a:o:D:E:f:w:t:h:',
         ('depdir=','depfile=','assert-file-list=',
          'output-all-resource-defines',
          'no-output-all-resource-defines',
+         'no-replace-ellipsis',
          'depend-on-stamp',
          'write-only-new='))
     for (key, val) in own_opts:
       if key == '-a':
         assert_output_files.append(val)
       elif key == '--assert-file-list':
         with open(val) as f:
           assert_output_files += f.read().splitlines()
       elif key == '-o':
         self.output_directory = val
       elif key == '-D':
         name, val = util.ParseDefine(val)
         self.defines[name] = val
       elif key == '-E':
         (env_name, env_value) = val.split('=', 1)
         os.environ[env_name] = env_value
       elif key == '-f':
         # TODO(joi@chromium.org): Remove this override once change
         # lands in WebKit.grd to specify the first_ids_file in the
         # .grd itself.
         first_ids_file = val
       elif key == '-w':
         whitelist_filenames.append(val)
       elif key == '--output-all-resource-defines':
         output_all_resource_defines = True
       elif key == '--no-output-all-resource-defines':
         output_all_resource_defines = False
+      elif key == '--no-replace-ellipsis':
+        replace_ellipsis = False
       elif key == '-t':
         target_platform = val
       elif key == '-h':
         rc_header_format = val
       elif key == '--depdir':
         depdir = val
       elif key == '--depfile':
         depfile = val
       elif key == '--write-only-new':
         write_only_new = val != '0'
@@ skipping 31 matching lines @@
     if output_all_resource_defines is not None:
       self.res.SetShouldOutputAllResourceDefines(output_all_resource_defines)
 
     # Set an output context so that conditionals can use defines during the
     # gathering stage; we use a dummy language here since we are not outputting
     # a specific language.
     self.res.SetOutputLanguage('en')
     if rc_header_format:
       self.res.AssignRcHeaderFormat(rc_header_format)
     self.res.RunGatherers()
+
+    # Replace ... with the single-character version. http://crbug.com/621772
+    if replace_ellipsis:
+      for node in self.res:
+        if isinstance(node, message.MessageNode):
+          node.SetReplaceEllipsis(True)
+
     self.Process()
 
     if assert_output_files:
       if not self.CheckAssertedOutputFiles(assert_output_files):
         return 2
 
     if depfile and depdir:
       self.GenerateDepfile(depfile, depdir, first_ids_file, depend_on_stamp)
 
     return 0
@@ skipping 20 matching lines @@
     # output.
     self.whitelist_names = None
 
     # Whether to compare outputs to their old contents before writing.
     self.write_only_new = False
 
   @staticmethod
   def AddWhitelistTags(start_node, whitelist_names):
     # Walk the tree of nodes added attributes for the nodes that shouldn't
     # be written into the target files (skip markers).
-    from grit.node import include
-    from grit.node import message
-    from grit.node import structure
     for node in start_node:
       # Same trick data_pack.py uses to see what nodes actually result in
       # real items.
       if (isinstance(node, include.IncludeNode) or
           isinstance(node, message.MessageNode) or
           isinstance(node, structure.StructureNode)):
         text_ids = node.GetTextualIds()
         # Mark the item to be skipped if it wasn't in the whitelist.
         if text_ids and text_ids[0] not in whitelist_names:
           node.SetWhitelistMarkedAsSkip(True)
@@ skipping 207 matching lines @@
     self.MakeDirectoriesTo(depfile)
     outfile = self.fo_create(depfile, 'w', encoding='utf-8')
     outfile.writelines(depfile_contents)
 
   @staticmethod
   def MakeDirectoriesTo(file):
     '''Creates directories necessary to contain |file|.'''
     dir = os.path.split(file)[0]
     if not os.path.exists(dir):
       os.makedirs(dir)