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

Side by Side Diff: chrome/installer/installer.gyp

Issue 1741010: gyp: unify toolkit_views usage (Closed)
Patch Set: Created 10 years, 7 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
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 }, 7 },
8 'includes': [ 8 'includes': [
9 # Two versions of installer_util target are defined in installer_util.gypi. 9 # Two versions of installer_util target are defined in installer_util.gypi.
10 # This allows to keep all the settings relevant to these targets in one 10 # This allows to keep all the settings relevant to these targets in one
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 # 'trunk' is a developer, testing-only package, so it shouldn't be 462 # 'trunk' is a developer, testing-only package, so it shouldn't be
463 # included in the 'linux_packages_all' collection. 463 # included in the 'linux_packages_all' collection.
464 'target_name': 'linux_packages_trunk', 464 'target_name': 'linux_packages_trunk',
465 'suppress_wildcard': 1, 465 'suppress_wildcard': 1,
466 'type': 'none', 466 'type': 'none',
467 'dependencies': [ 467 'dependencies': [
468 'linux_packages_trunk_deb', 468 'linux_packages_trunk_deb',
469 ], 469 ],
470 # ChromeOS doesn't care about RPM packages. 470 # ChromeOS doesn't care about RPM packages.
471 'conditions': [ 471 'conditions': [
472 ['chromeos==0 and toolkit_views==0', { 472 ['chromeos==0', {
473 'dependencies': [ 473 'dependencies': [
474 'linux_packages_trunk_rpm', 474 'linux_packages_trunk_rpm',
475 ], 475 ],
476 }], 476 }],
477 ], 477 ],
478 }, 478 },
479 { 479 {
480 'target_name': 'linux_packages_unstable', 480 'target_name': 'linux_packages_unstable',
481 'suppress_wildcard': 1, 481 'suppress_wildcard': 1,
482 'type': 'none', 482 'type': 'none',
483 'dependencies': [ 483 'dependencies': [
484 'linux_packages_unstable_deb', 484 'linux_packages_unstable_deb',
485 ], 485 ],
486 # ChromeOS doesn't care about RPM packages. 486 # ChromeOS doesn't care about RPM packages.
487 'conditions': [ 487 'conditions': [
488 ['chromeos==0 and toolkit_views==0', { 488 ['chromeos==0', {
489 'dependencies': [ 489 'dependencies': [
490 'linux_packages_unstable_rpm', 490 'linux_packages_unstable_rpm',
491 ], 491 ],
492 }], 492 }],
493 ], 493 ],
494 }, 494 },
495 { 495 {
496 'target_name': 'linux_packages_beta', 496 'target_name': 'linux_packages_beta',
497 'suppress_wildcard': 1, 497 'suppress_wildcard': 1,
498 'type': 'none', 498 'type': 'none',
499 'dependencies': [ 499 'dependencies': [
500 'linux_packages_beta_deb', 500 'linux_packages_beta_deb',
501 ], 501 ],
502 # ChromeOS doesn't care about RPM packages. 502 # ChromeOS doesn't care about RPM packages.
503 'conditions': [ 503 'conditions': [
504 ['chromeos==0 and toolkit_views==0', { 504 ['chromeos==0', {
505 'dependencies': [ 505 'dependencies': [
506 'linux_packages_beta_rpm', 506 'linux_packages_beta_rpm',
507 ], 507 ],
508 }], 508 }],
509 ], 509 ],
510 }, 510 },
511 { 511 {
512 'target_name': 'linux_packages_stable', 512 'target_name': 'linux_packages_stable',
513 'suppress_wildcard': 1, 513 'suppress_wildcard': 1,
514 'type': 'none', 514 'type': 'none',
515 'dependencies': [ 515 'dependencies': [
516 'linux_packages_stable_deb', 516 'linux_packages_stable_deb',
517 ], 517 ],
518 # ChromeOS doesn't care about RPM packages. 518 # ChromeOS doesn't care about RPM packages.
519 'conditions': [ 519 'conditions': [
520 ['chromeos==0 and toolkit_views==0', { 520 ['chromeos==0', {
521 'dependencies': [ 521 'dependencies': [
522 'linux_packages_stable_rpm', 522 'linux_packages_stable_rpm',
523 ], 523 ],
524 }], 524 }],
525 ], 525 ],
526 }, 526 },
527 # TODO(mmoss) gyp looping construct would be handy here ... 527 # TODO(mmoss) gyp looping construct would be handy here ...
528 # These package actions are the same except for the 'channel' variable. 528 # These package actions are the same except for the 'channel' variable.
529 { 529 {
530 'target_name': 'linux_packages_trunk_deb', 530 'target_name': 'linux_packages_trunk_deb',
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 }, 766 },
767 }], 767 }],
768 ], 768 ],
769 } 769 }
770 770
771 # Local Variables: 771 # Local Variables:
772 # tab-width:2 772 # tab-width:2
773 # indent-tabs-mode:nil 773 # indent-tabs-mode:nil
774 # End: 774 # End:
775 # vim: set expandtab tabstop=2 shiftwidth=2: 775 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698