diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:15:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:15:06 +0000 |
| commit | fd1d6998e6a96569e478c87220f6825a3e47851c (patch) | |
| tree | 0f2e2d2e174c20c4eb7366b2d678f58d8aaa633c /chrome/tools | |
| parent | 01bfd02b5e75ad54e90c5379da3a84c714c79bf6 (diff) | |
| download | chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.zip chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.tar.gz chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.tar.bz2 | |
Adding a secondary mini_installer target for Chrome Frame. This will remove the need to have different build scripts to build either Chrome or Chrome Frame.
Also remove the now-unneeded gyp variables 'chrome_frame_define' and 'google_update_appid'.
BUG=Both Chrome and Chrome Frame products should be buildable from a single solution file - we shouldn't need to run GYP with different settings to get a CF solution.
TEST=none
Review URL: http://codereview.chromium.org/542078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/build/win/create_installer_archive.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py index 35b5437..eeb0c01 100755 --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py @@ -147,12 +147,14 @@ 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) @@ -313,6 +315,9 @@ if '__main__' == __name__: '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', |