Committing for jeffbailey....

chrome_frame/chrome_frame.gyp

 # Copyright (c) 2010 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     'variables': {
@@ skipping 735 matching lines @@
       'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2',
       'dependencies': [
         'base_noicu',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_frame_utils',
         'chrome_launcher',
         'xulrunner_sdk',
         '../chrome/chrome.gyp:chrome_version_info',
+        '../chrome/chrome.gyp:chrome_version_header',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../build/temp_gyp/googleurl.gyp:googleurl',
       ],
       'sources': [
         'chrome_frame_npapi.rgs',
         'chrome_frame_npapi_entrypoints.cc',
         'chrome_frame_npapi_entrypoints.h',
         'chrome_tab.cc',
         'chrome_tab.def',
         'chrome_tab.h',
         'chrome_tab.idl',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
         'resources/tlb_resource.rc',
         'chrome_tab.rgs',
-        'chrome_tab_version.rc.version',
+        'chrome_tab_version.rc',
         'resource.h',
       ],
       'include_dirs': [
         # To allow including "chrome_tab.h"
         '<(INTERMEDIATE_DIR)',
         '<(INTERMEDIATE_DIR)/../chrome_frame',
       ],
       'conditions': [
         ['OS=="win"', {
           # NOTE(slightlyoff):
@@ skipping 27 matching lines @@
               'OutputFile':
                   '$(OutDir)\\servers\\$(ProjectName).dll',
               'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
               'BaseAddress': '0x33000000',
               # Set /SUBSYSTEM:WINDOWS (for consistency).
               'SubSystem': '2',
             },
           },
         }],
       ],
-      'rules': [
-        # Borrowed from chrome.gyp:chrome_dll_version, branding references
-        # removed
-        {
-          'rule_name': 'version',
-          'extension': 'version',
-          'variables': {
-            'version_py': '../chrome/tools/build/version.py',
-            'version_path': '../chrome/VERSION',
-            'lastchange_path':
-              '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
-            'template_input_path': 'chrome_tab_version.rc.version',
-          },
-          'conditions': [
-            [ 'branding == "Chrome"', {
-              'variables': {
-                 'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                 'branding_path': '../chrome/app/theme/chromium/BRANDING',
-              },
-            }],
-          ],
-          'inputs': [
-            '<(template_input_path)',
-            '<(version_path)',
-            '<(branding_path)',
-          ],
-          'outputs': [
-            '<(INTERMEDIATE_DIR)/chrome_tab_version.rc',
-          ],
-          'action': [
-            'python',
-            '<(version_py)',
-            '-f', '<(version_path)',
-            '-f', '<(branding_path)',
-            '-f', '<(lastchange_path)',
-            '<(template_input_path)',
-            '<@(_outputs)',
-          ],
-          'process_outputs_as_sources': 1,
-          'message': 'Generating version information in <(_outputs)'
-        },
-      ],
     },
   ],
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: