| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Script to create Chrome Installer archive. | 6 """Script to create Chrome Installer archive. |
| 7 | 7 |
| 8 This script is used to create an archive of all the files required for a | 8 This script is used to create an archive of all the files required for a |
| 9 Chrome install in appropriate directory structure. It reads chrome.release | 9 Chrome install in appropriate directory structure. It reads chrome.release |
| 10 file as input, creates chrome.7z archive, compresses setup.exe and | 10 file as input, creates chrome.7z archive, compresses setup.exe and |
| (...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 # If no chrome_runtime_deps was specified, every DLL in build_dir is | 523 # If no chrome_runtime_deps was specified, every DLL in build_dir is |
| 524 # considered to be a component DLL. | 524 # considered to be a component DLL. |
| 525 # TODO(jbauman): Remove when GYP is deprecated on Windows. | 525 # TODO(jbauman): Remove when GYP is deprecated on Windows. |
| 526 build_dlls = glob.glob(os.path.join(build_dir, '*.dll')) | 526 build_dlls = glob.glob(os.path.join(build_dir, '*.dll')) |
| 527 staged_dll_basenames = [os.path.basename(staged_dll) for staged_dll in \ | 527 staged_dll_basenames = [os.path.basename(staged_dll) for staged_dll in \ |
| 528 glob.glob(os.path.join(version_dir, '*.dll'))] | 528 glob.glob(os.path.join(version_dir, '*.dll'))] |
| 529 component_dll_filenames = [] | 529 component_dll_filenames = [] |
| 530 for component_dll in [dll for dll in build_dlls if \ | 530 for component_dll in [dll for dll in build_dlls if \ |
| 531 os.path.basename(dll) not in staged_dll_basenames]: | 531 os.path.basename(dll) not in staged_dll_basenames]: |
| 532 component_dll_name = os.path.basename(component_dll) | 532 component_dll_name = os.path.basename(component_dll) |
| 533 # ash*.dll remoting_*.dll's don't belong in the archive (it doesn't depend | 533 # These remoting_*.dll's don't belong in the archive (it doesn't depend |
| 534 # on them in gyp). Trying to copy them causes a build race when creating the | 534 # on them in gyp). Trying to copy them causes a build race when creating the |
| 535 # installer archive in component mode. See: crbug.com/180996 and | 535 # installer archive in component mode. See: crbug.com/180996 and |
| 536 # crbug.com/586967 | 536 # crbug.com/586967 |
| 537 if (component_dll_name.startswith('remoting_') or | 537 if (component_dll_name.startswith('remoting_')): |
| 538 component_dll_name.startswith('ash')): | |
| 539 continue | 538 continue |
| 540 | 539 |
| 541 component_dll_filenames.append(component_dll_name) | 540 component_dll_filenames.append(component_dll_name) |
| 542 g_archive_inputs.append(component_dll) | 541 g_archive_inputs.append(component_dll) |
| 543 shutil.copy(component_dll, version_dir) | 542 shutil.copy(component_dll, version_dir) |
| 544 | 543 |
| 545 # Augment {version}.manifest to include all component DLLs as part of the | 544 # Augment {version}.manifest to include all component DLLs as part of the |
| 546 # assembly it constitutes, which will allow dependents of this assembly to | 545 # assembly it constitutes, which will allow dependents of this assembly to |
| 547 # find these DLLs. | 546 # find these DLLs. |
| 548 version_assembly_dll_additions = [] | 547 version_assembly_dll_additions = [] |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 683 MINI_INSTALLER_INPUT_FILE) | 682 MINI_INSTALLER_INPUT_FILE) |
| 684 | 683 |
| 685 return options | 684 return options |
| 686 | 685 |
| 687 | 686 |
| 688 if '__main__' == __name__: | 687 if '__main__' == __name__: |
| 689 options = _ParseOptions() | 688 options = _ParseOptions() |
| 690 if options.verbose: | 689 if options.verbose: |
| 691 print sys.argv | 690 print sys.argv |
| 692 sys.exit(main(options)) | 691 sys.exit(main(options)) |
| OLD | NEW |