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

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: more fixes 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..2a3d1ac00b9cc9802df9afa89fc27eb75ba5816f 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -116,8 +116,20 @@ 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.
+ // The archive is usually extracted in |temp_path| in which case we want to
+ // move it as mentionned above; however if it is not in |temp_path| (e.g. in
robertshield 2012/08/17 16:46:56 nit: mentioned
gab 2012/08/17 17:01:36 Oops didn't realize I'd left this comment there...
+ // developer (component) builds where we use the archive directly from
+ // the build output), copy it instead of moving it).
+#if !defined(COMPONENT_BUILD)
install_list->AddMoveTreeWorkItem(archive_path.value(), archive_dst.value(),
temp_path.value(), WorkItem::ALWAYS_MOVE);
+#else // COMPONENT_BUILD
+ // In the component build setup.exe uses chrome.7z directly, moving it means
+ // that setup.exe cannot be ran again without regenerating the archive, so
robertshield 2012/08/17 16:46:56 ran -> run
gab 2012/08/17 17:01:36 Done.
+ // copy it instead 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