Upgrading lzma_sdk to version 9.20.

chrome/tools/build/win/create_installer_archive.py

 #!/usr/bin/python
-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+# 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.
 
 """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
   generates packed_files.txt for mini_installer project.
 
@@ skipping 112 matching lines @@
   if (options.diff_algorithm == "COURGETTE"):
     exe_file = os.path.join(options.last_chrome_installer, COURGETTE_EXEC)
     cmd = '%s -gen "%s" "%s" "%s"' % (exe_file, orig_file, new_file, patch_file)
   else:
     exe_file = os.path.join(options.output_dir, BSDIFF_EXEC)
     cmd = '%s "%s" "%s" "%s"' % (exe_file, orig_file, new_file, patch_file)
   RunSystemCommand(cmd)
 
 def GetLZMAExec(output_dir):
   lzma_exec = os.path.join(output_dir, "..", "..", "third_party",
-                           "lzma_sdk", "Executable", "7za.exe")
+                           "lzma_sdk", "7zr.exe")
   return lzma_exec
 
 def GetPrevVersion(output_dir, temp_dir, last_chrome_installer):
   if not last_chrome_installer:
     return ''
 
   lzma_exec = GetLZMAExec(options.output_dir)
   prev_archive_file = os.path.join(options.last_chrome_installer,
                                    options.output_name + ARCHIVE_SUFFIX)
   cmd = '%s x -o"%s" "%s" Chrome-bin/*/chrome.dll' % (lzma_exec, temp_dir,
@@ skipping 38 matching lines @@
 
 def CreateArchiveFile(options, staging_dir, current_version, prev_version):
   """Creates a new installer archive file after deleting any existing old file.
   """
   # First create an uncompressed archive file for the current build (chrome.7z)
   lzma_exec = GetLZMAExec(options.output_dir)
   archive_file = os.path.join(options.output_dir,
                               options.output_name + ARCHIVE_SUFFIX)
   cmd = '%s a -t7z "%s" "%s" -mx0' % (lzma_exec, archive_file,
                                       os.path.join(staging_dir, CHROME_DIR))
-  # There doesnt seem to be any way in 7za.exe to override existing file so
+  # There doesnt seem to be any way in 7zr.exe to override existing file so
   # we always delete before creating a new one.
   if not os.path.exists(archive_file):
     RunSystemCommand(cmd)
   elif options.skip_rebuild_archive != "true":
     os.remove(archive_file)
     RunSystemCommand(cmd)
 
   # If we are generating a patch, run bsdiff against previous build and
   # compress the resulting patch file. If this is not a patch just compress the
   # uncompressed archive file.
@@ skipping 124 matching lines @@
       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}.')
   option_parser.add_option('-n', '--output_name', default='chrome',
       help='Name used to prefix names of generated archives.')
 
   options, args = option_parser.parse_args()
   print sys.argv
   sys.exit(main(options))