| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 # TODO(dmaclach): can we pick this up some other way? Right now it's | 7 # TODO(dmaclach): can we pick this up some other way? Right now it's |
| 8 # duplicated from chrome.gyp | 8 # duplicated from chrome.gyp |
| 9 'chromium_code': 1, | 9 'chromium_code': 1, |
| 10 | 10 |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 | 646 |
| 647 ], # end of 'targets' | 647 ], # end of 'targets' |
| 648 }], # 'enable_remoting_host==1' | 648 }], # 'enable_remoting_host==1' |
| 649 | 649 |
| 650 ['OS!="win" and enable_remoting_host==1', { | 650 ['OS!="win" and enable_remoting_host==1', { |
| 651 'conditions': [ | 651 'conditions': [ |
| 652 ['OS=="linux" and branding=="Chrome" and chromeos==0', { | 652 ['OS=="linux" and branding=="Chrome" and chromeos==0', { |
| 653 'variables': { | 653 'variables': { |
| 654 'deb_cmd': 'host/installer/linux/build-deb.sh', | 654 'deb_cmd': 'host/installer/linux/build-deb.sh', |
| 655 'deb_filename': 'host/installer/<!(["<(deb_cmd)", "-p", "-s", "<(DEP
TH)"])', | 655 'deb_filename': 'host/installer/<!(["<(deb_cmd)", "-p", "-s", "<(DEP
TH)"])', |
| 656 'packaging_outputs': [ |
| 657 '<(deb_filename)', |
| 658 '<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")', |
| 659 '<(PRODUCT_DIR)/remoting_me2me_host.debug', |
| 660 '<(PRODUCT_DIR)/remoting_start_host.debug', |
| 661 ] |
| 656 }, | 662 }, |
| 657 'targets': [ | 663 'targets': [ |
| 658 { | 664 { |
| 659 # Store the installer package(s) into a zip file so there is a | 665 # Store the installer package(s) into a zip file so there is a |
| 660 # consistent filename to reference for build archiving (i.e. in | 666 # consistent filename to reference for build archiving (i.e. in |
| 661 # FILES.cfg). This also avoids possible conflicts with "wildcard" | 667 # FILES.cfg). This also avoids possible conflicts with "wildcard" |
| 662 # package handling in other build/signing scripts. | 668 # package handling in other build/signing scripts. |
| 663 'target_name': 'remoting_me2me_host_archive', | 669 'target_name': 'remoting_me2me_host_archive', |
| 664 'type': 'none', | 670 'type': 'none', |
| 665 'dependencies': [ | 671 'dependencies': [ |
| 666 'remoting_me2me_host_deb_installer', | 672 'remoting_me2me_host_deb_installer', |
| 667 ], | 673 ], |
| 668 'actions': [ | 674 'actions': [ |
| 669 { | 675 { |
| 670 #'variables': { | 676 #'variables': { |
| 671 # 'deb_cmd': 'host/installer/linux/build-deb.sh', | 677 # 'deb_cmd': 'host/installer/linux/build-deb.sh', |
| 672 #}, | 678 #}, |
| 673 'action_name': 'build_linux_installer_zip', | 679 'action_name': 'build_linux_installer_zip', |
| 674 'inputs': [ | 680 'inputs': [ |
| 675 '<(deb_filename)', | 681 '<@(packaging_outputs)', |
| 676 '<(PRODUCT_DIR)/remoting_me2me_host.debug', | |
| 677 '<(PRODUCT_DIR)/remoting_start_host.debug', | |
| 678 ], | 682 ], |
| 679 'outputs': [ | 683 'outputs': [ |
| 680 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', | 684 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', |
| 681 ], | 685 ], |
| 682 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ]
, | 686 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ]
, |
| 683 }, | 687 }, |
| 684 ], | 688 ], |
| 685 }, | 689 }, |
| 686 { | 690 { |
| 687 'target_name': 'remoting_me2me_host_deb_installer', | 691 'target_name': 'remoting_me2me_host_deb_installer', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 699 'host/installer/linux/debian/chrome-remote-desktop.init', | 703 'host/installer/linux/debian/chrome-remote-desktop.init', |
| 700 'host/installer/linux/debian/chrome-remote-desktop.pam', | 704 'host/installer/linux/debian/chrome-remote-desktop.pam', |
| 701 'host/installer/linux/debian/compat', | 705 'host/installer/linux/debian/compat', |
| 702 'host/installer/linux/debian/control', | 706 'host/installer/linux/debian/control', |
| 703 'host/installer/linux/debian/copyright', | 707 'host/installer/linux/debian/copyright', |
| 704 'host/installer/linux/debian/postinst', | 708 'host/installer/linux/debian/postinst', |
| 705 'host/installer/linux/debian/preinst', | 709 'host/installer/linux/debian/preinst', |
| 706 'host/installer/linux/debian/rules', | 710 'host/installer/linux/debian/rules', |
| 707 ], | 711 ], |
| 708 'outputs': [ | 712 'outputs': [ |
| 709 '<(deb_filename)', | 713 '<@(packaging_outputs)', |
| 710 '<(PRODUCT_DIR)/remoting_me2me_host.debug', | |
| 711 '<(PRODUCT_DIR)/remoting_start_host.debug', | |
| 712 ], | 714 ], |
| 713 'action': [ '<(deb_cmd)', '-s', '<(DEPTH)' ], | 715 'action': [ '<(deb_cmd)', '-s', '<(DEPTH)' ], |
| 714 }, | 716 }, |
| 715 ], | 717 ], |
| 716 }, | 718 }, |
| 717 ], | 719 ], |
| 718 }], | 720 }], |
| 719 ], | 721 ], |
| 720 'targets': [ | 722 'targets': [ |
| 721 { | 723 { |
| (...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2482 '../base/allocator/allocator.gyp:allocator', | 2484 '../base/allocator/allocator.gyp:allocator', |
| 2483 ], | 2485 ], |
| 2484 }, | 2486 }, |
| 2485 ], | 2487 ], |
| 2486 ], | 2488 ], |
| 2487 }], # end of 'toolkit_uses_gtk == 1' | 2489 }], # end of 'toolkit_uses_gtk == 1' |
| 2488 ], # end of 'conditions' | 2490 ], # end of 'conditions' |
| 2489 }, # end of target 'remoting_unittests' | 2491 }, # end of target 'remoting_unittests' |
| 2490 ], # end of targets | 2492 ], # end of targets |
| 2491 } | 2493 } |
| OLD | NEW |