diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 23:50:24 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 23:50:24 +0000 |
| commit | 086c229615fe702224c9436c982bfe46d3ebc4f0 (patch) | |
| tree | 62cf1ce4f4dae4eab180a4412bdede744a55ac40 /chrome/tools | |
| parent | 12d77abf7ac2601326172b19675bae8250e6dc05 (diff) | |
| download | chromium_src-086c229615fe702224c9436c982bfe46d3ebc4f0.zip chromium_src-086c229615fe702224c9436c982bfe46d3ebc4f0.tar.gz chromium_src-086c229615fe702224c9436c982bfe46d3ebc4f0.tar.bz2 | |
Fix chrome.7z archive on buildbots. The earlier change didn't work 100%.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/win/create_installer_archive.py | 10 | ||||
| -rw-r--r-- | chrome/tools/build/win/release.rules | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py index 302e31e..61579ae 100644 --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py @@ -135,11 +135,9 @@ def CreateArchiveFile(output_dir, staging_dir, current_version, os.path.join(staging_dir, CHROME_DIR)) # There doesnt seem to be any way in 7za.exe to override existing file so # we always delete before creating a new one. - print 'archive file %s ' % archive_file - print 'skip_rebuild_archive %s ' % skip_rebuild_archive if not os.path.exists(archive_file): RunSystemCommand(cmd) - elif not skip_rebuild_archive: + elif skip_rebuild_archive != "true": os.remove(archive_file) RunSystemCommand(cmd) @@ -225,8 +223,6 @@ def main(options): """Main method that reads input file, creates archive file and write resource input file. """ - print options - print os.environ current_version = BuildVersion(options.output_dir) config = Readconfig(options.output_dir, options.input_file, current_version) @@ -252,8 +248,8 @@ if '__main__' == __name__: 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', action='store_true', - default=False, help='Skip re-building Chrome.7z archive if it exists.') + 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 ' + diff --git a/chrome/tools/build/win/release.rules b/chrome/tools/build/win/release.rules index 62a304f..4bcf1c5 100644 --- a/chrome/tools/build/win/release.rules +++ b/chrome/tools/build/win/release.rules @@ -30,7 +30,7 @@ Name="SkipRebuildArchive" DisplayName="Skip Rebuilding Archive" Description="Skips rebuilding chrome.7z archive if it already exists" - Switch="--skip_rebuild_archive" + Switch="--skip_rebuild_archive="[value]"" /> </Properties> </CustomBuildRule> |