Respect output_all_resource_defines when generating resource maps.

grit/format/resource_map.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.
 
 '''This file contains item formatters for resource_map_header and
 resource_map_source files.  A resource map is a mapping between resource names
 (string) and the internal resource ID.'''
 
 import os
@@ skipping 92 matching lines @@
 
 
 def _FormatSource(get_key, root, lang, output_dir):
   from grit.format import rc_header
   from grit.node import include, structure, message
   yield _FormatSourceHeader(root)
   tids = rc_header.GetIds(root)
   seen = set()
   active_descendants = [item for item in root.ActiveDescendants()]
   for item in root:
-    if isinstance(item, (include.IncludeNode,
-                         structure.StructureNode,
-                         message.MessageNode)):
-      key = get_key(item)
-      tid = item.attrs['name']
-      if tid in tids and key not in seen:
-        seen.add(key)
-        # For messages, only include the active ones
-        if not isinstance(item, message.MessageNode) \
-            or item in active_descendants:
-          yield '  {"%s", %s},\n' % (key, tid)
+    if not isinstance(item, (include.IncludeNode,
+                             structure.StructureNode,
+                             message.MessageNode)):

[tony, 2014/08/06 21:13:31]

This code and the isinstance checks below are a little gross.  Would be nice to
move this into methods off of node in a separate refactoring change.  *shrug*

[Lei Zhang, 2014/08/06 21:41:08]

Done.

+      continue
+    key = get_key(item)
+    tid = item.attrs['name']
+    if tid not in tids or key in seen:
+      continue
+    seen.add(key)
+    should_yield = True
+    if isinstance(item, message.MessageNode):
+      # For messages, only include the active ones.
+      should_yield = item in active_descendants
+    elif isinstance(item, structure.StructureNode):
+      # For structures, it depends...
+      if not root.ShouldOutputAllResourceDefines():
+        should_yield = item in active_descendants
+    if should_yield:
+      yield '  {"%s", %s},\n' % (key, tid)
   yield _FormatSourceFooter(root)
 
 
 def _GetItemName(item):
   return item.attrs['name']
 
 
 def _GetItemPath(item):
   return item.GetInputPath().replace("\\", "/")