diff options
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.vcproj | 4 | ||||
| -rw-r--r-- | chrome/tools/build/win/create_installer_archive.py | 10 | ||||
| -rw-r--r-- | chrome/tools/build/win/release.rules | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.vcproj b/chrome/installer/mini_installer/mini_installer.vcproj index 96cfe0a..555293a 100644 --- a/chrome/installer/mini_installer/mini_installer.vcproj +++ b/chrome/installer/mini_installer/mini_installer.vcproj @@ -30,7 +30,7 @@ Name="create installer archive" LastChromeInstaller="$(LAST_CHROME_INSTALLER)" LastChromeVersion="$(LAST_CHROME_VERSION)" - RebuildArchive="$(REBUILD_CHROME_ARCHIVE)" + SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)" /> <Tool Name="Version" @@ -57,7 +57,7 @@ Name="create installer archive" LastChromeInstaller="$(LAST_CHROME_INSTALLER)" LastChromeVersion="$(LAST_CHROME_VERSION)" - RebuildArchive="$(REBUILD_CHROME_ARCHIVE)" + SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)" /> <Tool Name="Version" diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py index 95b3110..428178b 100644 --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py @@ -123,7 +123,7 @@ def RunSystemCommand(cmd): def CreateArchiveFile(output_dir, staging_dir, current_version, - prev_version_dir, prev_version, rebuild_archive): + prev_version_dir, prev_version, skip_rebuild_archive): """Creates a new installer archive file after deleting any existing old file. """ # First create an uncompressed archive file for the current build @@ -137,7 +137,7 @@ def CreateArchiveFile(output_dir, staging_dir, current_version, # we always delete before creating a new one. if not os.path.exists(archive_file): RunSystemCommand(cmd) - elif rebuild_archive: + elif not skip_rebuild_archive: os.remove(archive_file) RunSystemCommand(cmd) @@ -236,7 +236,7 @@ def main(options): # patch-<old_version>-<new_version>.7z or patch-<new_version>.7z archive_file_name = CreateArchiveFile(options.output_dir, staging_dir, current_version, options.last_chrome_installer, - options.last_chrome_version, options.rebuild_archive) + options.last_chrome_version, options.skip_rebuild_archive) CreateResourceInputFile(options.output_dir, options.last_chrome_installer, archive_file_name) @@ -248,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('-r', '--rebuild_archive', action='store_true', - default=False, help='Rebuild Chrome.7z archive, even if it exists.') + 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('-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 8c4170d..62a304f 100644 --- a/chrome/tools/build/win/release.rules +++ b/chrome/tools/build/win/release.rules @@ -7,7 +7,7 @@ <CustomBuildRule Name="create installer archive" DisplayName="create installer archive" - CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\create_installer_archive.py --output_dir="$(OutDir)" --input_file="$(InputPath)" --distribution=$(CHROMIUM_BUILD) [LastChromeInstaller] [LastChromeVersion] [RebuildArchive]" + CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\create_installer_archive.py --output_dir="$(OutDir)" --input_file="$(InputPath)" --distribution=$(CHROMIUM_BUILD) [LastChromeInstaller] [LastChromeVersion] [SkipRebuildArchive]" Outputs="$(OutDir)/$(InputName).7z;$(OutDir)/$(InputName).packed.7z;$(OutDir)/setup.ex_;$(OutDir)/packed_files.txt;" AdditionalDependencies="$(SolutionDir)\tools\build\win\create_installer_archive.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt38.dll" FileExtensions="*.release" @@ -26,11 +26,11 @@ Description="Last released version of Chrome (used to name the patch file)" Switch="--last_chrome_version="[value]"" /> - <BooleanProperty - Name="RebuildArchive" - DisplayName="Rebuild Archive" - Description="Rebuilds chrome.7z even if already exists" - Switch="--rebuild_archive" + <StringProperty + Name="SkipRebuildArchive" + DisplayName="Skip Rebuilding Archive" + Description="Skips rebuilding chrome.7z archive if it already exists" + Switch="--skip_rebuild_archive" /> </Properties> </CustomBuildRule> |