OLD | NEW |
1 { | 1 { |
2 'variables': { | 2 'variables': { |
3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
4 'VERSION': '../../chrome/VERSION', | 4 'VERSION': '../../chrome/VERSION', |
5 # 'BRANDING' is set in the 'conditions' section at the bottom. | 5 # 'BRANDING' is set in the 'conditions' section at the bottom. |
6 }, | 6 }, |
7 'includes': [ | 7 'includes': [ |
8 '../../build/common.gypi', | 8 '../../build/common.gypi', |
9 ], | 9 ], |
10 'targets': [ | 10 'targets': [ |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 '<(BRANDING)', '-f', '<(VERSION)', | 99 '<(BRANDING)', '-f', '<(VERSION)', |
100 '-o', '<@(_outputs)'], | 100 '-o', '<@(_outputs)'], |
101 }, | 101 }, |
102 ], | 102 ], |
103 }], | 103 }], |
104 ], | 104 ], |
105 }], | 105 }], |
106 ['OS=="win"', { | 106 ['OS=="win"', { |
107 'type': '<(library)', | 107 'type': '<(library)', |
108 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC', | 108 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC', |
| 109 'msvs_existing_vcproj': 'util/util.vcproj', |
109 'dependencies': [ | 110 'dependencies': [ |
110 'installer_util_strings', | 111 'installer_util_strings', |
111 '../chrome.gyp:common', | 112 '../chrome.gyp:common', |
112 '../chrome.gyp:chrome_resources', | 113 '../chrome.gyp:chrome_resources', |
113 '../chrome.gyp:chrome_strings', | 114 '../chrome.gyp:chrome_strings', |
114 '../../net/net.gyp:net_resources', | 115 '../../net/net.gyp:net_resources', |
115 '../../media/media.gyp:media', | 116 '../../media/media.gyp:media', |
116 '../../skia/skia.gyp:skia', | 117 '../../skia/skia.gyp:skia', |
117 '../../third_party/icu38/icu38.gyp:icui18n', | 118 '../../third_party/icu38/icu38.gyp:icui18n', |
118 '../../third_party/icu38/icu38.gyp:icuuc', | 119 '../../third_party/icu38/icu38.gyp:icuuc', |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 ], | 181 ], |
181 }, | 182 }, |
182 ], | 183 ], |
183 'conditions': [ | 184 'conditions': [ |
184 ['OS=="win"', { | 185 ['OS=="win"', { |
185 'targets': [ | 186 'targets': [ |
186 { | 187 { |
187 'target_name': 'gcapi_dll', | 188 'target_name': 'gcapi_dll', |
188 'type': 'loadable_module', | 189 'type': 'loadable_module', |
189 'msvs_guid': 'B802A2FE-E4E2-4F5A-905A-D5128875C954', | 190 'msvs_guid': 'B802A2FE-E4E2-4F5A-905A-D5128875C954', |
| 191 'msvs_existing_vcproj': 'gcapi/gcapi_dll.vcproj', |
190 'dependencies': [ | 192 'dependencies': [ |
191 '../../google_update/google_update.gyp:google_update', | 193 '../../google_update/google_update.gyp:google_update', |
192 ], | 194 ], |
193 'include_dirs': [ | 195 'include_dirs': [ |
194 '../..', | 196 '../..', |
195 ], | 197 ], |
196 'sources': [ | 198 'sources': [ |
197 'gcapi/gcapi.cc', | 199 'gcapi/gcapi.cc', |
198 'gcapi/gcapi.h', | 200 'gcapi/gcapi.h', |
199 ], | 201 ], |
200 }, | 202 }, |
201 { | 203 { |
202 'target_name': 'gcapi_lib', | 204 'target_name': 'gcapi_lib', |
203 'type': 'static_library', | 205 'type': 'static_library', |
204 'msvs_guid': 'CD2FD73A-6AAB-4886-B887-760D18E8B635', | 206 'msvs_guid': 'CD2FD73A-6AAB-4886-B887-760D18E8B635', |
| 207 'msvs_existing_vcpj': 'gcapi/gcapi_lib.vcproj', |
205 'dependencies': [ | 208 'dependencies': [ |
206 '../../google_update/google_update.gyp:google_update', | 209 '../../google_update/google_update.gyp:google_update', |
207 ], | 210 ], |
208 'include_dirs': [ | 211 'include_dirs': [ |
209 '../..', | 212 '../..', |
210 ], | 213 ], |
211 'sources': [ | 214 'sources': [ |
212 'gcapi/gcapi.cc', | 215 'gcapi/gcapi.cc', |
213 'gcapi/gcapi.h', | 216 'gcapi/gcapi.h', |
214 ], | 217 ], |
215 }, | 218 }, |
216 { | 219 { |
217 'target_name': 'gcapi_test', | 220 'target_name': 'gcapi_test', |
218 'type': 'executable', | 221 'type': 'executable', |
219 'msvs_guid': 'B64B396B-8EF1-4B6B-A07E-48D40EB961AB', | 222 'msvs_guid': 'B64B396B-8EF1-4B6B-A07E-48D40EB961AB', |
| 223 'msvs_existing_vcproj': 'gcapi/gcapi_test.vcproj', |
220 'dependencies': [ | 224 'dependencies': [ |
221 'gcapi_dll', | 225 'gcapi_dll', |
222 'gcapi_lib', | 226 'gcapi_lib', |
223 ], | 227 ], |
224 'include_dirs': [ | 228 'include_dirs': [ |
225 '../..', | 229 '../..', |
226 ], | 230 ], |
227 'sources': [ | 231 'sources': [ |
228 'gcapi/gcapi_test.cc', | 232 'gcapi/gcapi_test.cc', |
229 'gcapi/gcapi_test.rc', | 233 'gcapi/gcapi_test.rc', |
230 'gcapi/resource.h', | 234 'gcapi/resource.h', |
231 ], | 235 ], |
232 }, | 236 }, |
233 { | 237 { |
234 'target_name': 'installer_unittests', | 238 'target_name': 'installer_unittests', |
235 'type': 'executable', | 239 'type': 'executable', |
236 'msvs_guid': '903F8C1E-537A-4C9E-97BE-075147CBE769', | 240 'msvs_guid': '903F8C1E-537A-4C9E-97BE-075147CBE769', |
| 241 'msvs_existing_vcproj': 'util/installer_unittests.vcproj', |
237 'dependencies': [ | 242 'dependencies': [ |
238 'installer_util', | 243 'installer_util', |
239 'installer_util_strings', | 244 'installer_util_strings', |
240 '../../base/base.gyp:base', | 245 '../../base/base.gyp:base', |
241 '../../testing/gtest.gyp:gtest', | 246 '../../testing/gtest.gyp:gtest', |
242 ], | 247 ], |
243 'include_dirs': [ | 248 'include_dirs': [ |
244 '../..', | 249 '../..', |
245 ], | 250 ], |
246 'sources': [ | 251 'sources': [ |
(...skipping 11 matching lines...) Expand all Loading... |
258 'util/move_tree_work_item_unittest.cc', | 263 'util/move_tree_work_item_unittest.cc', |
259 'util/run_all_unittests.cc', | 264 'util/run_all_unittests.cc', |
260 'util/set_reg_value_work_item_unittest.cc', | 265 'util/set_reg_value_work_item_unittest.cc', |
261 'util/work_item_list_unittest.cc', | 266 'util/work_item_list_unittest.cc', |
262 ], | 267 ], |
263 }, | 268 }, |
264 { | 269 { |
265 'target_name': 'installer_util_strings', | 270 'target_name': 'installer_util_strings', |
266 'type': 'none', | 271 'type': 'none', |
267 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', | 272 'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013', |
| 273 'msvs_existing_vcproj': 'util/prebuild/util_prebuild.vcproj', |
268 'actions': [ | 274 'actions': [ |
269 { | 275 { |
270 # TODO(sgk): Clean this up so that we pass in the | 276 # TODO(sgk): Clean this up so that we pass in the |
271 # file names to the script instead of having it hard-code | 277 # file names to the script instead of having it hard-code |
272 # matching path names internally. | 278 # matching path names internally. |
273 'action_name': 'installer_util_strings', | 279 'action_name': 'installer_util_strings', |
274 'inputs': [ | 280 'inputs': [ |
275 'util/prebuild/create_string_rc.py', | 281 'util/prebuild/create_string_rc.py', |
276 '../app/generated_resources.grd', | 282 '../app/generated_resources.grd', |
277 ], | 283 ], |
(...skipping 17 matching lines...) Expand all Loading... |
295 'direct_dependent_settings': { | 301 'direct_dependent_settings': { |
296 'include_dirs': [ | 302 'include_dirs': [ |
297 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', | 303 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', |
298 ], | 304 ], |
299 }, | 305 }, |
300 }, | 306 }, |
301 { | 307 { |
302 'target_name': 'mini_installer', | 308 'target_name': 'mini_installer', |
303 'type': 'executable', | 309 'type': 'executable', |
304 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', | 310 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', |
| 311 'msvs_existing_vcproj': 'mini_installer/mini_installer.vcproj', |
305 'dependencies': [ | 312 'dependencies': [ |
306 '../chrome.gyp:app', | 313 '../chrome.gyp:app', |
307 '../chrome.gyp:chrome_dll', | 314 '../chrome.gyp:chrome_dll', |
308 ], | 315 ], |
309 'include_dirs': [ | 316 'include_dirs': [ |
310 '../..', | 317 '../..', |
311 '<(PRODUCT_DIR)', | 318 '<(PRODUCT_DIR)', |
312 '<(INTERMEDIATE_DIR)', | 319 '<(INTERMEDIATE_DIR)', |
313 ], | 320 ], |
314 'sources': [ | 321 'sources': [ |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
412 'variables': { | 419 'variables': { |
413 'BRANDING': '../../chrome/app/theme/chromium/BRANDING', | 420 'BRANDING': '../../chrome/app/theme/chromium/BRANDING', |
414 }, | 421 }, |
415 }], | 422 }], |
416 ], | 423 ], |
417 }, | 424 }, |
418 { | 425 { |
419 'target_name': 'mini_installer_test', | 426 'target_name': 'mini_installer_test', |
420 'type': 'executable', | 427 'type': 'executable', |
421 'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1', | 428 'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1', |
| 429 'msvs_existing_vcproj': '../test/mini_installer_test/mini_installer_te
st.vcproj', |
422 'dependencies': [ | 430 'dependencies': [ |
423 'installer_util', | 431 'installer_util', |
424 '../../base/base.gyp:base', | 432 '../../base/base.gyp:base', |
425 '../../testing/gtest.gyp:gtest', | 433 '../../testing/gtest.gyp:gtest', |
426 ], | 434 ], |
427 'include_dirs': [ | 435 'include_dirs': [ |
428 '../..', | 436 '../..', |
429 ], | 437 ], |
430 'sources': [ | 438 'sources': [ |
431 'setup/setup_constants.cc', | 439 'setup/setup_constants.cc', |
432 'util/run_all_unittests.cc', | 440 'util/run_all_unittests.cc', |
433 '../test/mini_installer_test/chrome_mini_installer.cc', | 441 '../test/mini_installer_test/chrome_mini_installer.cc', |
434 '../test/mini_installer_test/chrome_mini_installer.h', | 442 '../test/mini_installer_test/chrome_mini_installer.h', |
435 '../test/mini_installer_test/mini_installer_test_constants.cc', | 443 '../test/mini_installer_test/mini_installer_test_constants.cc', |
436 '../test/mini_installer_test/mini_installer_test_constants.h', | 444 '../test/mini_installer_test/mini_installer_test_constants.h', |
437 '../test/mini_installer_test/test.cc', | 445 '../test/mini_installer_test/test.cc', |
438 ], | 446 ], |
439 }, | 447 }, |
440 { | 448 { |
441 'target_name': 'setup', | 449 'target_name': 'setup', |
442 'type': 'executable', | 450 'type': 'executable', |
443 'msvs_guid': '21C76E6E-8B38-44D6-8148-B589C13B9554', | 451 'msvs_guid': '21C76E6E-8B38-44D6-8148-B589C13B9554', |
| 452 'msvs_existing_vcproj': 'setup/setup.vcproj', |
444 'dependencies': [ | 453 'dependencies': [ |
445 'installer_util', | 454 'installer_util', |
446 'installer_util_strings', | 455 'installer_util_strings', |
447 '../chrome.gyp:app', | 456 '../chrome.gyp:app', |
448 '../chrome.gyp:chrome_dll', | 457 '../chrome.gyp:chrome_dll', |
449 '../../build/win/system.gyp:cygwin', | 458 '../../build/win/system.gyp:cygwin', |
450 '../../courgette/courgette.gyp:courgette_lib', | 459 '../../courgette/courgette.gyp:courgette_lib', |
451 '../../third_party/bspatch/bspatch.gyp:bspatch', | 460 '../../third_party/bspatch/bspatch.gyp:bspatch', |
452 ], | 461 ], |
453 'include_dirs': [ | 462 'include_dirs': [ |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 'variables': { | 574 'variables': { |
566 'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING', | 575 'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING', |
567 }, | 576 }, |
568 }, { # else branding!="Chrome" | 577 }, { # else branding!="Chrome" |
569 'variables': { | 578 'variables': { |
570 'BRANDING': '../../chrome/app/theme/chromium/BRANDING', | 579 'BRANDING': '../../chrome/app/theme/chromium/BRANDING', |
571 }, | 580 }, |
572 }], | 581 }], |
573 ], | 582 ], |
574 } | 583 } |
OLD | NEW |