Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5143)

Unified Diff: chrome/installer/setup/install_worker.cc

Issue 10825342: Do not compress chrome.7z into chrome.packed.7z for developer (component) builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unify comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 171de1d2ef3ca3fae72e6aef474dc842efdfb820..43ce81a1676efa5126c00999bd3bd8c73bbfaafc 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -116,8 +116,18 @@ void AddInstallerCopyTasks(const InstallerState& installer_state,
// %LOCALAPPDATA% otherwise), there is no need to do this for the archive.
// Setup.exe, on the other hand, is created elsewhere so it must always be
// copied.
+#if !defined(COMPONENT_BUILD)
install_list->AddMoveTreeWorkItem(archive_path.value(), archive_dst.value(),
temp_path.value(), WorkItem::ALWAYS_MOVE);
+#else // COMPONENT_BUILD
+ // The archive is usually extracted in |temp_path| in which case we want to
+ // move it as mentioned above; however in the component build, setup.exe
+ // uses chrome.7z directly from the build output, moving it means that
+ // setup.exe cannot be run again without regenerating the archive, so copy
+ // it instead in this case to save developer time.
+ install_list->AddCopyTreeWorkItem(archive_path.value(), archive_dst.value(),
+ temp_path.value(), WorkItem::ALWAYS);
+#endif // COMPONENT_BUILD
}
}
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/tools/build/win/create_installer_archive.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698