Add support to override output_all_resource_defines from command line.

grit/tool/build.py

Index: grit/tool/build.py
diff --git a/grit/tool/build.py b/grit/tool/build.py
index e72724f90b2411de7dd60b6751a52d133b6b2a6b..3c0ba3ef8e2d79d499568cb834c78ec671154218 100644
--- a/grit/tool/build.py
+++ b/grit/tool/build.py
@@ -123,8 +123,11 @@ are exported to translation interchange files (e.g. XMB files), etc.
     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)
@@ -146,6 +149,10 @@ are exported to translation interchange files (e.g. XMB files), etc.
         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':
@@ -178,6 +185,12 @@ are exported to translation interchange files (e.g. XMB files), etc.
                                 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.