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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 6153003: Refactor install.cc into the work item parts and the non-work item parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: PostMergeTest3AddingMissingFile Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/installer/setup/chrome_frame_ready_mode.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 'include_dirs': [ 201 'include_dirs': [
202 '<(SHARED_INTERMEDIATE_DIR)/setup', 202 '<(SHARED_INTERMEDIATE_DIR)/setup',
203 ], 203 ],
204 }, 204 },
205 'sources': [ 205 'sources': [
206 'installer/mini_installer/chrome.release', 206 'installer/mini_installer/chrome.release',
207 'installer/setup/chrome_frame_ready_mode.cc', 207 'installer/setup/chrome_frame_ready_mode.cc',
208 'installer/setup/chrome_frame_ready_mode.h', 208 'installer/setup/chrome_frame_ready_mode.h',
209 'installer/setup/install.cc', 209 'installer/setup/install.cc',
210 'installer/setup/install.h', 210 'installer/setup/install.h',
211 'installer/setup/install_worker.cc',
212 'installer/setup/install_worker.h',
211 'installer/setup/setup_main.cc', 213 'installer/setup/setup_main.cc',
212 'installer/setup/setup.ico', 214 'installer/setup/setup.ico',
213 'installer/setup/setup.rc', 215 'installer/setup/setup.rc',
214 'installer/setup/setup_constants.cc', 216 'installer/setup/setup_constants.cc',
215 'installer/setup/setup_constants.h', 217 'installer/setup/setup_constants.h',
216 'installer/setup/setup_exe_version.rc.version', 218 'installer/setup/setup_exe_version.rc.version',
217 'installer/setup/setup_resource.h', 219 'installer/setup/setup_resource.h',
218 'installer/setup/setup_util.cc', 220 'installer/setup/setup_util.cc',
219 'installer/setup/setup_util.h', 221 'installer/setup/setup_util.h',
220 'installer/setup/uninstall.cc', 222 'installer/setup/uninstall.cc',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 { 306 {
305 'target_name': 'setup_unittests', 307 'target_name': 'setup_unittests',
306 'type': 'executable', 308 'type': 'executable',
307 'msvs_guid': 'C0AE4E06-F023-460F-BC14-6302CEAC51F8', 309 'msvs_guid': 'C0AE4E06-F023-460F-BC14-6302CEAC51F8',
308 'dependencies': [ 310 'dependencies': [
309 'installer_util', 311 'installer_util',
310 '<(DEPTH)/base/base.gyp:base', 312 '<(DEPTH)/base/base.gyp:base',
311 '<(DEPTH)/base/base.gyp:base_i18n', 313 '<(DEPTH)/base/base.gyp:base_i18n',
312 '<(DEPTH)/base/base.gyp:test_support_base', 314 '<(DEPTH)/base/base.gyp:test_support_base',
313 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 315 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
316 '<(DEPTH)/testing/gmock.gyp:gmock',
314 '<(DEPTH)/testing/gtest.gyp:gtest', 317 '<(DEPTH)/testing/gtest.gyp:gtest',
315 ], 318 ],
316 'include_dirs': [ 319 'include_dirs': [
317 '<(DEPTH)', 320 '<(DEPTH)',
318 ], 321 ],
322 # TODO(robertshield): Move the items marked with "Move to lib"
323 # below into a separate lib and then link both setup.exe and
324 # setup_unittests.exe against that.
319 'sources': [ 325 'sources': [
326 'installer/setup/install_worker.cc', # Move to lib
327 'installer/setup/install_worker.h', # Move to lib
328 'installer/setup/install_worker_unittest.cc',
320 'installer/setup/run_all_unittests.cc', 329 'installer/setup/run_all_unittests.cc',
330 'installer/setup/setup_constants.cc', # Move to lib
331 'installer/setup/setup_constants.h', # Move to lib
321 'installer/setup/setup_util.cc', 332 'installer/setup/setup_util.cc',
322 'installer/setup/setup_util_unittest.cc', 333 'installer/setup/setup_util_unittest.cc',
323 ], 334 ],
324 }, 335 },
325 ], 336 ],
326 }], 337 }],
327 ['OS=="linux" and branding=="Chrome"', { 338 ['OS=="linux" and branding=="Chrome"', {
328 'variables': { 339 'variables': {
329 # Always google_chrome since this only applies to branding==Chrome. 340 # Always google_chrome since this only applies to branding==Chrome.
330 'branding_dir': 'app/theme/google_chrome', 341 'branding_dir': 'app/theme/google_chrome',
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 }, 883 },
873 }], 884 }],
874 ], 885 ],
875 } 886 }
876 887
877 # Local Variables: 888 # Local Variables:
878 # tab-width:2 889 # tab-width:2
879 # indent-tabs-mode:nil 890 # indent-tabs-mode:nil
880 # End: 891 # End:
881 # vim: set expandtab tabstop=2 shiftwidth=2: 892 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/chrome_frame_ready_mode.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698