Revert of Remove duplication in mini_installer.gyp/.gypi (patchset #4 id:60001 of https://codereview.chromium.org/1080313003/)

Reason for revert:
It seems like it's breaking the official build:

WARNING: File not found: mini_installer_exe_version.rc

Original issue's description:
> Remove duplication in mini_installer.gyp/.gypi
>
> BUG=470889
>
> Committed: https://crrev.com/77592558a510ee237f3308f987eca62903a4698a
> Cr-Commit-Position: refs/heads/master@{#328811}

TBR=siggi@chromium.org,grt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=470889

Review URL: https://codereview.chromium.org/1130883006

Cr-Commit-Position: refs/heads/master@{#328954}

1 files changed, 279 insertions, 10 deletions

diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 58a63c3..76e72ee 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -14,22 +14,291 @@
   ],
   'conditions': [
     ['OS=="win"', {
+      'includes': [
+        '../test/mini_installer/test_installer.gypi',
+      ],
       'targets': [
         {
+	  # A target that is outdated if any of the mini_installer test sources
+	  # are modified.
+          'target_name': 'test_installer_sentinel',
+          'type': 'none',
+          'actions': [
+            {
+              'action_name': 'touch_sentinel',
+	      'variables': {
+	        'touch_sentinel_py': '../tools/build/win/touch_sentinel.py',
+              },
+              'inputs': [
+                '<@(test_installer_sources)',  # from test_installer.gypi
+	        '<(touch_sentinel_py)',
+              ],
+              'outputs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/installer/test_installer_sentinel'],
+              'action': ['python', '<(touch_sentinel_py)', '<@(_outputs)'],
+            },
+          ],
+        },
+        {
           'target_name': 'mini_installer',
+          'type': 'executable',
+
+          'dependencies': [
+            '../chrome.gyp:chrome',
+            '../chrome.gyp:chrome_nacl_win64',
+            '../chrome.gyp:chrome_dll',
+            '../chrome.gyp:default_extensions',
+            '../chrome.gyp:setup',
+            'test_installer_sentinel',
+          ],
+          'include_dirs': [
+            '../..',
+            '<(INTERMEDIATE_DIR)',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome',
+          ],
+          'sources': [
+            '<(INTERMEDIATE_DIR)/packed_files.rc',
+            'mini_installer/appid.h',
+            'mini_installer/chrome.release',
+            'mini_installer/chrome_appid.cc',
+            'mini_installer/configuration.cc',
+            'mini_installer/configuration.h',
+            'mini_installer/decompress.cc',
+            'mini_installer/decompress.h',
+            'mini_installer/exit_code.h',
+            'mini_installer/mini_installer.cc',
+            'mini_installer/mini_installer.ico',
+            'mini_installer/mini_installer.rc',
+            'mini_installer/mini_installer_constants.cc',
+            'mini_installer/mini_installer_constants.h',
+            'mini_installer/mini_installer_exe_version.rc.version',
+            'mini_installer/mini_installer_resource.h',
+            'mini_installer/mini_string.cc',
+            'mini_installer/mini_string.h',
+            'mini_installer/pe_resource.cc',
+            'mini_installer/pe_resource.h',
+          ],
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'EnableIntrinsicFunctions': 'true',
+              'BufferSecurityCheck': 'false',
+              'BasicRuntimeChecks': '0',
+              'ExceptionHandling': '0',
+            },
+            'VCLinkerTool': {
+              'RandomizedBaseAddress': '1',
+              'DataExecutionPrevention': '0',
+              'AdditionalLibraryDirectories': [
+                '<(PRODUCT_DIR)/lib'
+              ],
+              'DelayLoadDLLs': [],
+              'EntryPointSymbol': 'MainEntryPoint',
+              'IgnoreAllDefaultLibraries': 'true',
+              'OptimizeForWindows98': '1',
+              'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+              'AdditionalDependencies': [
+                'shlwapi.lib',
+                'setupapi.lib',
+              ],
+            },
+            'VCManifestTool': {
+              'AdditionalManifestFiles': [
+                '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
+              ],
+            },
+          },
+          'configurations': {
+            'Debug_Base': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'BasicRuntimeChecks': '0',
+                  'BufferSecurityCheck': 'false',
+                  'ExceptionHandling': '0',
+                },
+                'VCLinkerTool': {
+                  'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+                  'AdditionalOptions': [
+                    '/safeseh:no',
+                    '/dynamicbase:no',
+                    '/ignore:4199',
+                    '/ignore:4221',
+                    '/nxcompat',
+                  ],
+                },
+              },
+            },
+            'Release_Base': {
+              'includes': ['../../build/internal/release_defaults.gypi'],
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'EnableIntrinsicFunctions': 'true',
+                  'BasicRuntimeChecks': '0',
+                  'BufferSecurityCheck': 'false',
+                  'ExceptionHandling': '0',
+                  'WholeProgramOptimization': 'false',
+                },
+                'VCLinkerTool': {
+                  'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
+                  'Profile': 'false',   # Conflicts with /FIXED
+                  'AdditionalOptions': [
+                    '/SAFESEH:NO',
+                    '/NXCOMPAT',
+                    '/DYNAMICBASE:NO',
+                    '/FIXED',
+                  ],
+                },
+              },
+            },
+          },
+
+          # Disable precompiled headers for this project, to avoid
+          # linker errors when building with VS 2008.
+          'msvs_precompiled_header': '',
+          'msvs_precompiled_source': '',
+
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+
           'variables': {
-            'chrome_dll_project': [
-              '../chrome.gyp:chrome_dll',
-            ],
-            'chrome_dll_path': [
-              '<(PRODUCT_DIR)/chrome.dll',
-            ],
-            'output_dir': '<(PRODUCT_DIR)',
+            # Opt out the common compatibility manifest to work around
+            # crbug.com/272660.
+            # TODO(yukawa): Enable the common compatibility manifest again.
+            'win_exe_compatibility_manifest': '',
           },
-          'includes': [
-            'mini_installer.gypi',
+          'rules': [
+            {
+              'rule_name': 'mini_installer_version',
+              'extension': 'version',
+              'variables': {
+                'template_input_path': 'mini_installer/mini_installer_exe_version.rc.version',
+              },
+              'inputs': [
+                '<(template_input_path)',
+                '<(version_path)',
+                '<(lastchange_path)',
+                '<(branding_dir)/BRANDING',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/mini_installer_exe_version.rc',
+              ],
+              'action': [
+                'python', '<(version_py)',
+                '-f', '<(version_path)',
+                '-f', '<(lastchange_path)',
+                '-f', '<(branding_dir)/BRANDING',
+                '<(template_input_path)',
+                '<@(_outputs)',
+              ],
+              'process_outputs_as_sources': 1,
+              'message': 'Generating version information'
+            },
+          ],
+          'actions': [
+            {
+              'action_name': 'installer_archive',
+              'variables': {
+                'create_installer_archive_py_path':
+                  '../tools/build/win/create_installer_archive.py',
+              },
+              'conditions': [
+                ['enable_hidpi == 1', {
+                  'variables': {
+                    'enable_hidpi_flag': '--enable_hidpi=1',
+                  },
+                }, {
+                  'variables': {
+                    'enable_hidpi_flag': '',
+                  },
+                }],
+                ['component == "shared_library"', {
+                  'variables': {
+                    'component_build_flag': '--component_build=1',
+                  },
+                }, {
+                  'variables': {
+                    'component_build_flag': '',
+                  },
+                  'outputs': [
+                    '<(PRODUCT_DIR)/chrome.packed.7z',
+                  ],
+                }],
+                ['disable_nacl==1', {
+                  'inputs!': [
+                    '<(PRODUCT_DIR)/nacl64.exe',
+                    '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                    '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+                  ],
+                }],
+                ['target_arch=="x64"', {
+                  'inputs!': [
+                    '<(PRODUCT_DIR)/nacl64.exe',
+                    '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                  ],
+                  'variables': {
+                    'target_arch_flag': '--target_arch=x64',
+                  },
+                }, {
+                  'variables': {
+                    'target_arch_flag': '--target_arch=x86',
+                  },
+                }],
+                ['icu_use_data_file_flag == 0', {
+                  'inputs': [
+                    '<(PRODUCT_DIR)/icudt.dll',
+                  ],
+                }, { # else icu_use_data_file_flag != 0
+                  'inputs': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                  ],
+                }],
+                ['v8_use_external_startup_data == 1', {
+                  'inputs': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                }],
+              ],
+              'inputs': [
+                '<(create_installer_archive_py_path)',
+                '<(PRODUCT_DIR)/chrome.exe',
+                '<(PRODUCT_DIR)/chrome.dll',
+                '<(PRODUCT_DIR)/nacl64.exe',
+                '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+                '<(PRODUCT_DIR)/locales/en-US.pak',
+                '<(PRODUCT_DIR)/setup.exe',
+                'mini_installer/chrome.release',
+              ],
+              'outputs': [
+                # Also note that chrome.packed.7z is defined as an output in a
+                # conditional above.
+                '<(PRODUCT_DIR)/chrome.7z',
+                '<(PRODUCT_DIR)/setup.ex_',
+                '<(INTERMEDIATE_DIR)/packed_files.rc',
+              ],
+              'depfile': '<(INTERMEDIATE_DIR)/installer_archive.d',
+              'action': [
+                'python',
+                '<(create_installer_archive_py_path)',
+                '--build_dir', '<(PRODUCT_DIR)',
+                '--staging_dir', '<(INTERMEDIATE_DIR)',
+                '--input_file', 'mini_installer/chrome.release',
+                '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
+                '--depfile', '<(INTERMEDIATE_DIR)/installer_archive.d',
+                '<(enable_hidpi_flag)',
+                '<(component_build_flag)',
+                '<(target_arch_flag)',
+                # TODO(sgk):  may just use environment variables
+                #'--distribution=$(CHROMIUM_BUILD)',
+                '--distribution=_google_chrome',
+                # Optional arguments to generate diff installer
+                #'--last_chrome_installer=C:/Temp/base',
+                #'--setup_exe_format=DIFF',
+                #'--diff_algorithm=COURGETTE',
+              ],
+              'message': 'Create installer archive',
+            },
           ],
-        }
+        },
       ],
       'conditions': [
         ['test_isolation_mode != "noop"', {