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

chrome/tools/build/win/create_installer_archive.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """Script to create Chrome Installer archive.
 
   This script is used to create an archive of all the files required for a
   Chrome install in appropriate directory structure. It reads chrome.release
   file as input, creates chrome.7z archive, compresses setup.exe and
@@ skipping 129 matching lines @@
   cmd = '%s x -o"%s" "%s" Chrome-bin/*/gears.dll' % (lzma_exec, temp_dir,
                                                        prev_archive_file)
   RunSystemCommand(cmd)
   dll_path = glob.glob(os.path.join(temp_dir, 'Chrome-bin', '*', 'gears.dll'))
   return os.path.split(os.path.split(dll_path[0])[0])[1]
 
 def MakeStagingDirectories(output_dir):
   """Creates a staging path for installer archive. If directory exists already,
   deletes the existing directory.
   """
-  file_path = os.path.join(output_dir, ARCHIVE_DIR)
+  prefixed_archive_dir = (options.archive_prefix or "") + ARCHIVE_DIR
+  file_path = os.path.join(output_dir, prefixed_archive_dir)
   if os.path.exists(file_path):
     shutil.rmtree(file_path)
   os.makedirs(file_path)
 
-  temp_file_path = os.path.join(output_dir, TEMP_ARCHIVE_DIR)
+  prefixed_temp_archive_dir = (options.archive_prefix or "") + TEMP_ARCHIVE_DIR
+  temp_file_path = os.path.join(output_dir, prefixed_temp_archive_dir)
   if os.path.exists(temp_file_path):
     shutil.rmtree(temp_file_path)
   os.makedirs(temp_file_path)
   return (file_path, temp_file_path)
 
 def Readconfig(output_dir, input_file, current_version):
   """Reads config information from input file after setting default value of
   global variabes.
   """
   variables = {}
@@ skipping 140 matching lines @@
   option_parser.add_option('-i', '--input_file', help='Input file')
   option_parser.add_option('-d', '--distribution',
       help='Name of Chromium Distribution. Optional.')
   option_parser.add_option('-s', '--skip_rebuild_archive',
       default="False", help='Skip re-building Chrome.7z archive if it exists.')
   option_parser.add_option('-l', '--last_chrome_installer',
       help='Generate differential installer. The value of this parameter ' +
            'specifies the directory that contains base versions of ' +
            'setup.exe, courgette.exe (if --diff_algorithm is COURGETTE) ' +
            '& chrome.7z.')
+  option_parser.add_option('-p', '--archive_prefix',
+      help='Specifies a prefix to the archive path. Useful if building ' +
+           'multiple installer archives.')
   option_parser.add_option('-f', '--setup_exe_format', default='COMPRESSED',
       help='How setup.exe should be included {COMPRESSED|DIFF|FULL}.')
   option_parser.add_option('-a', '--diff_algorithm', default='BSDIFF',
       help='Diff algorithm to use when generating differential patches ' +
            '{BSDIFF|COURGETTE}.')
 
   options, args = option_parser.parse_args()
   print sys.argv
   sys.exit(main(options))