| Index: chrome/tools/build/win/create_installer_archive.py
|
| diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
|
| index 2e85d9bcfe890e321c7f84c2bc5db2e1f622d548..c61f10f225c63362792f42f6c588528b5c640449 100755
|
| --- a/chrome/tools/build/win/create_installer_archive.py
|
| +++ b/chrome/tools/build/win/create_installer_archive.py
|
| @@ -90,7 +90,7 @@ def CompressUsingLZMA(build_dir, compressed_file, input_file):
|
|
|
|
|
| def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
|
| - enable_hidpi):
|
| + enable_hidpi, enable_metro):
|
| """Copies the files required for installer archive.
|
| Copies all common files required for various distributions of Chromium and
|
| also files for the specific Chromium build specified by distribution.
|
| @@ -103,6 +103,8 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
|
| staging_dir, build_dir)
|
| if enable_hidpi == '1':
|
| CopySectionFilesToStagingDir(config, 'HIDPI', staging_dir, build_dir)
|
| + if enable_metro == '1':
|
| + CopySectionFilesToStagingDir(config, 'METRO', staging_dir, build_dir)
|
|
|
|
|
| def CopySectionFilesToStagingDir(config, section, staging_dir, build_dir):
|
| @@ -328,12 +330,12 @@ def main(options):
|
| if options.build_dir != options.output_dir:
|
| CopyAllFilesToStagingDir(config, options.distribution,
|
| staging_dir, options.output_dir,
|
| - options.enable_hidpi)
|
| + options.enable_hidpi, options.enable_metro)
|
|
|
| # Now copy the remainder of the files from the build dir.
|
| CopyAllFilesToStagingDir(config, options.distribution,
|
| staging_dir, options.build_dir,
|
| - options.enable_hidpi)
|
| + options.enable_hidpi, options.enable_metro)
|
|
|
| version_numbers = current_version.split('.')
|
| current_build_number = version_numbers[2] + '.' + version_numbers[3]
|
| @@ -387,6 +389,9 @@ def _ParseOptions():
|
| help='Name used to prefix names of generated archives.')
|
| parser.add_option('--enable_hidpi', default='0',
|
| help='Whether to include HiDPI resource files.')
|
| + parser.add_option('--enable_metro', default='0',
|
| + help='Whether to include resource files from the "METRO" section of the '
|
| + 'input file.')
|
|
|
| options, args = parser.parse_args()
|
| if not options.build_dir:
|
|
|