diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:24:17 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:24:17 +0000 |
commit | 663f339a1197711e5a9b0f0f382920e529f4fb3e (patch) | |
tree | ab66a4b7e8d014f3711b133db23376ba3848fe93 /chrome/installer/mini_installer.gyp | |
parent | 0e7d57fa87b02031db31444a22cba54b32405896 (diff) | |
download | chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.zip chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.tar.gz chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.tar.bz2 |
Include the Chrome Frame binary in Chrome installers. Note that it will only be registered (and thus used) if the installer is run with the --chrome-frame flag.
Remove a bunch of CF-specific code in the process.
BUG=46818
TEST=Can use the same mini_installer.exe to install either Chrome or Chrome Frame.
Review URL: http://codereview.chromium.org/2839009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer.gyp')
-rw-r--r-- | chrome/installer/mini_installer.gyp | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index dd8a888..90c5929 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -201,62 +201,6 @@ }, ], }, - { - 'target_name': 'chrome_frame_mini_installer', - 'type': 'executable', - 'msvs_guid': '2F3651F5-4662-4565-A4F6-AD15B0E893AA', - 'sources': [ - 'mini_installer/chrome_frame.release', - 'mini_installer/chrome_frame_appid.cc', - ], - 'dependencies': [ - # Artificially make this depend on the other to avoid - # problems with parallel packaging scripts being run. - 'mini_installer', - ], - 'rules': [ - { - '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', - '<(PRODUCT_DIR)/chrome.dll', - '<(PRODUCT_DIR)/nacl64.exe', - '<(PRODUCT_DIR)/nacl64.dll', - '<(PRODUCT_DIR)/locales/en-US.dll', - '<(PRODUCT_DIR)/icudt42.dll', - ], - 'outputs': [ - 'xxx.out', - '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', - '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', - '<(PRODUCT_DIR)/setup.ex_', - '<(PRODUCT_DIR)/packed_files.txt', - ], - 'action': [ - 'python', - '<(create_installer_archive_py_path)', - '--output_dir=<(PRODUCT_DIR)', - '--input_file=<(RULE_INPUT_PATH)', - # TODO(sgk): may just use environment variables - #'--distribution=$(CHROMIUM_BUILD)', - '--distribution=_google_chrome', - '--archive_prefix=cf', - '--output_name=chrome_frame', - # Optional arguments to generate diff installer - #'--last_chrome_installer=C:/Temp/base', - #'--setup_exe_format=DIFF', - #'--diff_algorithm=COURGETTE', - ], - 'message': 'Create Chrome Frame installer archive' - }, - ], - }, ], }], [ 'branding == "Chrome"', { |