Adding a secondary mini_installer target for Chrome Frame. This will remove t...

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'includes': [
     # Two versions of installer_util target are defined in installer_util.gypi.
     # This allows to keep all the settings relevant to these targets in one
@@ skipping 158 matching lines @@
         {
           'target_name': 'setup',
           'type': 'executable',
           'msvs_guid': '21C76E6E-8B38-44D6-8148-B589C13B9554',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
             '../../build/util/build_util.gyp:lastchange',
             '../../build/util/support/support.gyp:*',
             '../../build/win/system.gyp:cygwin',
+            '../../chrome_frame/chrome_frame.gyp:npchrome_frame',
           ],
           'include_dirs': [
             '../..',
             '<(INTERMEDIATE_DIR)',
             '<(SHARED_INTERMEDIATE_DIR)/setup',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/setup',
             ],
           },
           'sources': [
-            'mini_installer/chrome.release',
+            'mini_installer/chrome_frame.release',
             'setup/install.cc',
             'setup/install.h',
             'setup/setup_main.cc',
             'setup/setup.ico',
             'setup/setup.rc',
             'setup/setup_constants.cc',
             'setup/setup_constants.h',
             'setup/setup_exe_version.rc.version',
             'setup/setup_resource.h',
             'setup/setup_util.cc',
@@ skipping 35 matching lines @@
                 '<@(_outputs)',
               ],
               'process_outputs_as_sources': 1,
               'message': 'Generating version information'
             },
             {
               'rule_name': 'server_dlls',
               'extension': 'release',
               'variables': {
                 'scan_server_dlls_py' : '../tools/build/win/scan_server_dlls.py',
+                'template_file': 'mini_installer/chrome_frame.release',
               },
               'inputs': [
-                '<scan_server_dlls_py)',
+                '<(scan_server_dlls_py)',
+                '<(template_file)'
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/registered_dlls.h',
               ],
               'action': [
                 'python',
                 '<(scan_server_dlls_py)',
                 '--output_dir=<(PRODUCT_DIR)',
                 '--input_file=<(RULE_INPUT_PATH)',
                 '--header_output_dir=<(INTERMEDIATE_DIR)',
                 # TODO(sgk):  may just use environment variables
                 #'--distribution=$(CHROMIUM_BUILD)',
                 '--distribution=_google_chrome',
               ],
             },
           ],
           'conditions': [
-            ['chrome_frame_define==1', {
-              'dependencies': [
-                '../../chrome_frame/chrome_frame.gyp:npchrome_frame',
-              ],
-            }],
             # TODO(mark):  <(branding_dir) should be defined by the
             # global condition block at the bottom of the file, but
             # this doesn't work due to the following issue:
             #
             #   http://code.google.com/p/gyp/issues/detail?id=22
             #
             # Remove this block once the above issue is fixed.
             [ 'branding == "Chrome"', {
               'variables': {
                  'branding_dir': '../app/theme/google_chrome',
@@ skipping 475 matching lines @@
       },
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: