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 |
} |
} |