Add support to override output_all_resource_defines from command line.

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 filecmp
@@ skipping 37 matching lines @@
   module = sys.modules[modulename]
   try:
     return module.Format
   except AttributeError:
     return module.GetFormatter(type)
 
 
 class RcBuilder(interface.Tool):
   '''A tool that builds RC files and resource header files for compilation.
 
 Usage:  grit build [-o OUTPUTDIR] [-D NAME[=VAL]]*

[newt (away), 2014/10/30 20:16:20]

update this usage comment as well

[lliabraa, 2014/10/31 11:33:13]

Done.

 
 All output options for this tool are specified in the input file (see
 'grit help' for details on how to specify the input file - it is a global
 option).
 
 Options:
 
   -a FILE           Assert that the given file is an output. There can be
                     multiple "-a" flags listed for multiple outputs. If a "-a"
                     or "--assert-file-list" argument is present, then the list
@@ skipping 47 matching lines @@
 
   def Run(self, opts, args):
     self.output_directory = '.'
     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
     (own_opts, args) = getopt.getopt(args, 'a:o:D:E:f:w:t:h:',
-        ('depdir=','depfile=','assert-file-list='))
+        ('depdir=','depfile=','assert-file-list=',
+         'output-all-resource-defines',

[newt (away), 2014/10/30 20:16:20]

Alternatively, this could accept an argument, e.g.

  --output-all-resource-defines=1

or

  --output-all-resource-defines=0

This might be easier to integrate with GYP/GN. Either way should be fine though.

[lliabraa, 2014/10/31 11:33:13]

I think this is a little more explicit because it avoids the ambiguity of what
to put on the command line (--output-all=1, '1', True, true, etc).  Also,
--output-all-resource-defines=0 ends up using the string '0' which doesn't
evaluate to False so it would need a little coercing.

The gyp change is just to add --output-all-resource-defines or
--no-output-all-resource-defines to the list of grit_defines. In the examples
I'm thinking of it's no better/worse than --output-all-resource-defines=1/0, but
maybe you had something specific in mind.

+         'nooutput-all-resource-defines',))
     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 == '--nooutput-all-resource-defines':
+        output_all_resource_defines = False
       elif key == '-t':
         target_platform = val
       elif key == '-h':
         rc_header_format = val
       elif key == '--depdir':
         depdir = val
       elif key == '--depfile':
         depfile = val
 
     if len(args):
@@ skipping 12 matching lines @@
       for whitelist_filename in whitelist_filenames:
         self.VerboseOut('Using whitelist: %s\n' % whitelist_filename);
         whitelist_contents = util.ReadFile(whitelist_filename, util.RAW_TEXT)
         self.whitelist_names.update(whitelist_contents.strip().split('\n'))
 
     self.res = grd_reader.Parse(opts.input,
                                 debug=opts.extra_verbose,
                                 first_ids_file=first_ids_file,
                                 defines=self.defines,
                                 target_platform=target_platform)
+
+    # If the output_all_resource_defines option is specified, override the value
+    # found in the grd file.
+    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()
     self.Process()
 
     if assert_output_files:
@@ skipping 234 matching lines @@
     self.MakeDirectoriesTo(depfile)
     outfile = self.fo_create(depfile, 'wb')
     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)