OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 // | 4 // |
5 // This file contains the definitions of the installer functions that build | 5 // This file contains the definitions of the installer functions that build |
6 // the WorkItemList used to install the application. | 6 // the WorkItemList used to install the application. |
7 | 7 |
8 #include "chrome/installer/setup/install_worker.h" | 8 #include "chrome/installer/setup/install_worker.h" |
9 | 9 |
10 #include <oaidl.h> | 10 #include <oaidl.h> |
(...skipping 98 matching lines...) Loading... |
109 temp_path.value(), WorkItem::ALWAYS); | 109 temp_path.value(), WorkItem::ALWAYS); |
110 } | 110 } |
111 | 111 |
112 if (archive_path != archive_dst) { | 112 if (archive_path != archive_dst) { |
113 // In the past, we copied rather than moved for system level installs so | 113 // In the past, we copied rather than moved for system level installs so |
114 // that the permissions of %ProgramFiles% would be picked up. Now that | 114 // that the permissions of %ProgramFiles% would be picked up. Now that |
115 // |temp_path| is in %ProgramFiles% for system level installs (and in | 115 // |temp_path| is in %ProgramFiles% for system level installs (and in |
116 // %LOCALAPPDATA% otherwise), there is no need to do this for the archive. | 116 // %LOCALAPPDATA% otherwise), there is no need to do this for the archive. |
117 // Setup.exe, on the other hand, is created elsewhere so it must always be | 117 // Setup.exe, on the other hand, is created elsewhere so it must always be |
118 // copied. | 118 // copied. |
| 119 #if !defined(COMPONENT_BUILD) |
119 install_list->AddMoveTreeWorkItem(archive_path.value(), archive_dst.value(), | 120 install_list->AddMoveTreeWorkItem(archive_path.value(), archive_dst.value(), |
120 temp_path.value(), WorkItem::ALWAYS_MOVE); | 121 temp_path.value(), WorkItem::ALWAYS_MOVE); |
| 122 #else // COMPONENT_BUILD |
| 123 // The archive is usually extracted in |temp_path| in which case we want to |
| 124 // move it as mentioned above; however in the component build, setup.exe |
| 125 // uses chrome.7z directly from the build output, moving it means that |
| 126 // setup.exe cannot be run again without regenerating the archive, so copy |
| 127 // it instead in this case to save developer time. |
| 128 install_list->AddCopyTreeWorkItem(archive_path.value(), archive_dst.value(), |
| 129 temp_path.value(), WorkItem::ALWAYS); |
| 130 #endif // COMPONENT_BUILD |
121 } | 131 } |
122 } | 132 } |
123 | 133 |
124 // This method adds work items to create (or update) Chrome uninstall entry in | 134 // This method adds work items to create (or update) Chrome uninstall entry in |
125 // either the Control Panel->Add/Remove Programs list or in the Omaha client | 135 // either the Control Panel->Add/Remove Programs list or in the Omaha client |
126 // state key if running under an MSI installer. | 136 // state key if running under an MSI installer. |
127 void AddUninstallShortcutWorkItems(const InstallerState& installer_state, | 137 void AddUninstallShortcutWorkItems(const InstallerState& installer_state, |
128 const FilePath& setup_path, | 138 const FilePath& setup_path, |
129 const Version& new_version, | 139 const Version& new_version, |
130 WorkItemList* install_list, | 140 WorkItemList* install_list, |
(...skipping 1446 matching lines...) Loading... |
1577 machine_state, | 1587 machine_state, |
1578 setup_path, | 1588 setup_path, |
1579 new_version, | 1589 new_version, |
1580 work_item_list, | 1590 work_item_list, |
1581 false, // have_child_product | 1591 false, // have_child_product |
1582 cmd_line, | 1592 cmd_line, |
1583 kCmdQuickEnableApplicationHost); | 1593 kCmdQuickEnableApplicationHost); |
1584 } | 1594 } |
1585 | 1595 |
1586 } // namespace installer | 1596 } // namespace installer |
OLD | NEW |