Standardize grit invokes

chrome/app/policy/policy_templates.gypi

 # Copyright (c) 2011 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.
 
 {
   'conditions': [
     ['OS=="win" or OS=="mac" or OS=="linux"', {
       'targets': [
         {
           # policy_templates has different inputs and outputs, so it can't use
           # the rules of chrome_strings
           'target_name': 'policy_templates',
           'type': 'none',
           'variables': {
-            'grd_path': 'policy_templates.grd',
-            'template_files': [
-              '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grd_path))'
-            ],
+            'grit_grd_file': 'policy_templates.grd',
+            'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py',
+                              '<@(grit_defines)'],
           },
+          # Grit target boiler plate.
+          'includes': [ '../../../build/grit_target.gypi' ],

[tony, 2011/03/25 18:07:04]

Can we use <(DEPTH)?

[TVL, 2011/03/25 18:15:53]

Nope, includes happen before variable expansion.

           'actions': [
             {
               'action_name': 'policy_templates',
-              'variables': {
-                'conditions': [
-                  ['branding=="Chrome"', {
-                    # TODO(mmoss) The .grd files look for _google_chrome, but
-                    # for consistency they should look for GOOGLE_CHROME_BUILD
-                    # like C++.
-                    # Clean this up when Windows moves to gyp.
-                    'chrome_build': '_google_chrome',
-                  }, {  # else: branding!="Chrome"
-                    'chrome_build': '_chromium',
-                  }],
-                ],
-              },
-              'inputs': [
-                '<!@(<(grit_info_cmd) --inputs <(grd_path))',
-              ],
-              'outputs': [
-                '<@(template_files)'
-              ],
-              'action': [
-                '<@(grit_cmd)',
-                '-i', '<(grd_path)', 'build',
-                '-o', '<(grit_out_dir)',
-                '<@(grit_defines)',
-              ],
-              'conditions': [
-                ['OS == "mac"', {
-                  'action': ['-D', 'mac_bundle_id=<(mac_bundle_id)'],
-                }],
-              ],
-              'message': 'Generating policy templates from <(grd_path)',
+              # Grit action boiler plate.
+              'includes': [ '../../../build/grit_action.gypi' ],
             },
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(grit_out_dir)',
-            ],
-          },
           'conditions': [
             ['OS=="win"', {
               'variables': {
                 'version_path': '<(grit_out_dir)/app/policy/VERSION',
+                'template_files': [
+                  '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grit_grd_file))'
+                ],
               },
               'actions': [
                 {
                   'action_name': 'add_version',
                   'inputs': ['../../VERSION'],
                   'outputs': ['<(version_path)'],
                   'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
                 },
                 {
                   # Add all the templates generated at the previous step into
@@ skipping 16 matching lines @@
                     '<(zip_script)',
                     '<@(_outputs)',
                     '<(grit_out_dir)/app/policy',
                     '<@(template_files)',
                     '<(version_path)'
                   ],
                   'message': 'Packing generated templates into <(_outputs)',
                 }
               ]
             }],
-            ['OS=="win"', {
-              'dependencies': ['../build/win/system.gyp:cygwin'],
-            }],
-          ],
+          ],  # conditions
         },
       ],  # 'targets'
     }],  # OS=="win" or OS=="mac" or OS=="linux"
     ['OS=="mac"', {
       'targets': [
         {
           # This is the bundle of the manifest file of Chrome.
           # It contains the manifest file and its string tables.
           'target_name': 'chrome_manifest_bundle',
           'type': 'loadable_module',
@@ skipping 61 matching lines @@
       ]
     }]
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: