Build a Syzygy-reordered mini_installer.exe.

This CL adds an All_syzygy target to the build/all.gyp solution,
that builds a Syzygy-reordered chrome.dll and mini_installer.
If there there is a chrome.dll-order.json file present in the output
directory, chrome.dll will be ordered according to that, otherwise
it will be randomized.
Moved most of mini_installer.gyp to a common .gypi file for reuse.


Review URL: http://codereview.chromium.org/8698009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111710 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 258 insertions, 0 deletions

diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
new file mode 100644
index 0000000..4014263
--- /dev/null
+++ b/chrome/installer/mini_installer.gypi
@@ -0,0 +1,213 @@
+# 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.
+{
+  'dependencies': [
+    '<(chrome_dll_project)',
+    '../chrome.gyp:chrome',
+    '../chrome.gyp:chrome_nacl_win64',
+    '../chrome.gyp:default_extensions',
+    '../chrome.gyp:setup',
+  ],
+  'include_dirs': [
+    '../..',
+    '<(INTERMEDIATE_DIR)',
+    '<(SHARED_INTERMEDIATE_DIR)/chrome',
+  ],
+  'sources': [
+    '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/mini_installer.cc',
+    'mini_installer/mini_installer.h',
+    'mini_installer/mini_installer.ico',
+    'mini_installer/mini_installer.rc',
+    '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',
+    '<(INTERMEDIATE_DIR)/packed_files.rc',
+  ],
+  # Disable precompiled headers for this project, to avoid
+  # linker errors when building with VS 2008.
+  'msvs_precompiled_header': '',
+  'msvs_precompiled_source': '',
+  'msvs_settings': {
+    'VCCLCompilerTool': {
+      'EnableIntrinsicFunctions': 'true',
+      'BufferSecurityCheck': 'false',
+      'BasicRuntimeChecks': '0',
+      'ExceptionHandling': '0',
+    },
+    'VCLinkerTool': {
+      'OutputFile': '<(output_dir)/mini_installer.exe', 
+      'RandomizedBaseAddress': '1',
+      'DataExecutionPrevention': '0',
+      'AdditionalLibraryDirectories': [
+        '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
+        '<(PRODUCT_DIR)/lib'
+      ],
+      'DelayLoadDLLs': [],
+      'EntryPointSymbol': 'MainEntryPoint',
+      'GenerateMapFile': 'true',
+      'IgnoreAllDefaultLibraries': 'true',
+      'OptimizeForWindows98': '1',
+      'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+      'AdditionalDependencies': [
+        'shlwapi.lib',
+        'setupapi.lib',
+      ],
+      'conditions': [
+        ['MSVS_VERSION=="2005e"', {
+          'AdditionalDependencies': [  # Must explicitly link in VC2005E
+            'advapi32.lib',
+            'shell32.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',
+        },
+        'VCLinkerTool': {
+          'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
+          'Profile': 'false',  # Conflicts with /FIXED
+          'AdditionalOptions': [
+            '/SAFESEH:NO',
+            '/NXCOMPAT',
+            '/DYNAMICBASE:NO',
+            '/FIXED',
+          ],
+        },
+      },
+    },
+  },
+  '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': [
+        '<(INTERMEDIATE_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'
+    },
+    {
+      'rule_name': 'installer_archive',
+      'extension': 'release',
+      'variables': {
+        'create_installer_archive_py_path':
+          '../tools/build/win/create_installer_archive.py',
+      },
+      'inputs': [
+        '<(create_installer_archive_py_path)',
+        '<(PRODUCT_DIR)/chrome.exe',
+        '<(chrome_dll_path)',
+        '<(PRODUCT_DIR)/nacl64.exe',
+        '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
+        '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+        '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+        '<(PRODUCT_DIR)/locales/en-US.pak',
+        '<(PRODUCT_DIR)/icudt.dll',
+      ],
+      'outputs': [
+        'xxx.out',
+        '<(output_dir)/<(RULE_INPUT_NAME).7z',
+        '<(output_dir)/<(RULE_INPUT_NAME).packed.7z',
+        '<(output_dir)/setup.ex_',
+        '<(INTERMEDIATE_DIR)/packed_files.rc',
+      ],
+      'action': [
+        'python',
+        '<(create_installer_archive_py_path)',
+        '--build_dir=<(PRODUCT_DIR)',
+        '--output_dir=<(output_dir)',
+        '--staging_dir=<(INTERMEDIATE_DIR)',
+        '--input_file=<(RULE_INPUT_PATH)',
+        '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
+        # 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'
+    },
+  ],
+  # 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.
+  'conditions': [
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '../app/theme/google_chrome',
+      },
+    }, { # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '../app/theme/chromium',
+      },
+    }],
+  ],
+}
\ No newline at end of file
diff --git a/chrome/installer/mini_installer_syzygy.gyp b/chrome/installer/mini_installer_syzygy.gyp
new file mode 100644
index 0000000..461dd59
--- /dev/null
+++ b/chrome/installer/mini_installer_syzygy.gyp
@@ -0,0 +1,45 @@
+# 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.
+{
+  'variables': {
+    'version_py': '<(DEPTH)/chrome/tools/build/version.py',
+    'version_path': '<(DEPTH)/chrome/VERSION',
+    'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
+    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'msvs_use_common_release': 0,
+    'msvs_use_common_linker_extras': 0,
+  },
+  'includes': [
+    '../../build/win_precompile.gypi',
+  ],
+  'conditions': [
+    # This target won't build in fastbuild, since there are no PDBs. 
+    ['OS=="win" and fastbuild==0', {
+      'targets': [
+        {
+          'target_name': 'mini_installer_syzygy',
+          'type': 'executable',
+          'product_name': 'mini_installer',
+
+          'variables': {
+            'chrome_dll_project': '../chrome_syzygy.gyp:chrome_dll_syzygy',
+            'chrome_dll_path': '<(PRODUCT_DIR)/syzygy/chrome.dll',
+            'output_dir': '<(PRODUCT_DIR)/syzygy',
+          },
+          # Bulk of the build configuration comes from here.
+          'includes': [ 'mini_installer.gypi', ],
+        },
+      ],
+    }],
+    [ 'branding == "Chrome"', {
+      'variables': {
+         'branding_dir': '../app/theme/google_chrome',
+      },
+    }, {  # else branding!="Chrome"
+      'variables': {
+         'branding_dir': '../app/theme/chromium',
+      },
+    }],
+  ],
+}