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

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

Issue 300013: Add yasm and ffmpeg into the build tree for linux. (Closed)
Patch Set: Fix mark's comments. Created 11 years, 1 month 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
« no previous file with comments | « build/all.gyp ('k') | media/base/media_posix.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 { 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 'conditions': [ 8 'conditions': [
9 ['OS=="win"', { 9 ['OS=="win"', {
10 'targets': [ 10 'targets': [
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 ], 477 ],
478 'variables': { 478 'variables': {
479 'version' : '<!(python <(version_py) -f ../../chrome/VERSION -t "@MA JOR@.@MINOR@.@BUILD@.@PATCH@")', 479 'version' : '<!(python <(version_py) -f ../../chrome/VERSION -t "@MA JOR@.@MINOR@.@BUILD@.@PATCH@")',
480 'revision' : '<!(python ../../build/util/lastchange.py | cut -d "=" -f 2)', 480 'revision' : '<!(python ../../build/util/lastchange.py | cut -d "=" -f 2)',
481 'input_files': [ 481 'input_files': [
482 # TODO(mmoss) Any convenient way to get all the relevant build 482 # TODO(mmoss) Any convenient way to get all the relevant build
483 # files? (e.g. all locales, resources, etc.) 483 # files? (e.g. all locales, resources, etc.)
484 '<(PRODUCT_DIR)/chrome', 484 '<(PRODUCT_DIR)/chrome',
485 '<(PRODUCT_DIR)/chrome.pak', 485 '<(PRODUCT_DIR)/chrome.pak',
486 '<(PRODUCT_DIR)/chrome_sandbox', 486 '<(PRODUCT_DIR)/chrome_sandbox',
487 '<(PRODUCT_DIR)/libavcodec.so.52', 487 '<(PRODUCT_DIR)/libffmpegsumo.so',
488 '<(PRODUCT_DIR)/libavformat.so.52',
489 '<(PRODUCT_DIR)/libavutil.so.50',
490 '<(PRODUCT_DIR)/xdg-settings', 488 '<(PRODUCT_DIR)/xdg-settings',
491 '<(PRODUCT_DIR)/locales/en-US.pak', 489 '<(PRODUCT_DIR)/locales/en-US.pak',
492 '<(PRODUCT_DIR)/themes/default.pak', 490 '<(PRODUCT_DIR)/themes/default.pak',
493 ], 491 ],
494 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 492 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
495 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', 493 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh',
496 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', 494 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh',
497 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', 495 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
498 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 496 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
499 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 497 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 }, 627 },
630 }], 628 }],
631 ], 629 ],
632 } 630 }
633 631
634 # Local Variables: 632 # Local Variables:
635 # tab-width:2 633 # tab-width:2
636 # indent-tabs-mode:nil 634 # indent-tabs-mode:nil
637 # End: 635 # End:
638 # vim: set expandtab tabstop=2 shiftwidth=2: 636 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | media/base/media_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698