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

Side by Side Diff: remoting/remoting.gyp

Issue 10832124: [Chromoting] Moving Windows-only host installation script to remoting/host/win. Moving scripts to r… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « remoting/host/win/chromoting.wxs ('k') | remoting/tools/candle_and_light.py » ('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) 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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 'targets': [ 720 'targets': [
721 { 721 {
722 'target_name': 'remoting_host_installation', 722 'target_name': 'remoting_host_installation',
723 'type': 'none', 723 'type': 'none',
724 'dependencies': [ 724 'dependencies': [
725 'remoting_host_controller', 725 'remoting_host_controller',
726 'remoting_service', 726 'remoting_service',
727 'remoting_me2me_host', 727 'remoting_me2me_host',
728 ], 728 ],
729 'sources': [ 729 'sources': [
730 'host/installer/chromoting.wxs', 730 'host/win/chromoting.wxs',
731 ], 731 ],
732 'outputs': [ 732 'outputs': [
733 '<(PRODUCT_DIR)/chromoting.msi', 733 '<(PRODUCT_DIR)/chromoting.msi',
734 ], 734 ],
735 'wix_defines' : [ 735 'wix_defines' : [
736 '-dBranding=<(branding)', 736 '-dBranding=<(branding)',
737 ], 737 ],
738 'conditions': [ 738 'conditions': [
739 ['buildtype == "Official"', { 739 ['buildtype == "Official"', {
740 'wix_defines': [ 740 'wix_defines': [
741 '-dOfficialBuild=1', 741 '-dOfficialBuild=1',
742 ], 742 ],
743 }], 743 }],
744 ], 744 ],
745 'rules': [ 745 'rules': [
746 { 746 {
747 'rule_name': 'candle_and_light', 747 'rule_name': 'candle_and_light',
748 'extension': 'wxs', 748 'extension': 'wxs',
749 'inputs': [ 749 'inputs': [
750 '<(PRODUCT_DIR)/remoting_host_controller.exe', 750 '<(PRODUCT_DIR)/remoting_host_controller.exe',
751 '<(PRODUCT_DIR)/remoting_me2me_host.exe', 751 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
752 '<(PRODUCT_DIR)/remoting_service.exe', 752 '<(PRODUCT_DIR)/remoting_service.exe',
753 '<(sas_dll_path)/sas.dll', 753 '<(sas_dll_path)/sas.dll',
754 'resources/chromoting.ico', 754 'resources/chromoting.ico',
755 'candle_and_light.py', 755 'tools/candle_and_light.py',
756 ], 756 ],
757 'outputs': [ 757 'outputs': [
758 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', 758 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
759 ], 759 ],
760 'msvs_cygwin_shell': 0, 760 'msvs_cygwin_shell': 0,
761 'action': [ 761 'action': [
762 'python', 'candle_and_light.py', 762 'python', 'tools/candle_and_light.py',
763 '--wix_path', '<(wix_path)', 763 '--wix_path', '<(wix_path)',
764 '--version', '<(version_full)', 764 '--version', '<(version_full)',
765 '--product_dir', '<(PRODUCT_DIR).', 765 '--product_dir', '<(PRODUCT_DIR).',
766 '--intermediate_dir', '<(INTERMEDIATE_DIR).', 766 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
767 '--sas_dll_path', '<(sas_dll_path)', 767 '--sas_dll_path', '<(sas_dll_path)',
768 '--input', '<(RULE_INPUT_PATH)', 768 '--input', '<(RULE_INPUT_PATH)',
769 '--output', '<@(_outputs)', 769 '--output', '<@(_outputs)',
770 '<@(_wix_defines)', 770 '<@(_wix_defines)',
771 ], 771 ],
772 'message': 'Generating <@(_outputs)', 772 'message': 'Generating <@(_outputs)',
(...skipping 20 matching lines...) Expand all
793 '<(PRODUCT_DIR)/chromoting.msi', 793 '<(PRODUCT_DIR)/chromoting.msi',
794 ], 794 ],
795 'outputs': [ 795 'outputs': [
796 '<(INTERMEDIATE_DIR)/chromoting-test.msi', 796 '<(INTERMEDIATE_DIR)/chromoting-test.msi',
797 ], 797 ],
798 'rules': [ 798 'rules': [
799 { 799 {
800 'rule_name': 'dark_and_candle_and_light', 800 'rule_name': 'dark_and_candle_and_light',
801 'extension': 'msi', 801 'extension': 'msi',
802 'inputs': [ 802 'inputs': [
803 'dark_and_candle_and_light.py', 803 'tools/dark_and_candle_and_light.py',
804 ], 804 ],
805 'outputs': [ 805 'outputs': [
806 '<(INTERMEDIATE_DIR)/chromoting-test.msi', 806 '<(INTERMEDIATE_DIR)/chromoting-test.msi',
807 ], 807 ],
808 'msvs_cygwin_shell': 0, 808 'msvs_cygwin_shell': 0,
809 'action': [ 809 'action': [
810 'python', 810 'python',
811 'dark_and_candle_and_light.py', 811 'tools/dark_and_candle_and_light.py',
812 '--wix_path', '<(wix_path)', 812 '--wix_path', '<(wix_path)',
813 '--input', '<(RULE_INPUT_PATH)', 813 '--input', '<(RULE_INPUT_PATH)',
814 '--intermediate_dir', '<(INTERMEDIATE_DIR).', 814 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
815 '--output', '<@(_outputs)', 815 '--output', '<@(_outputs)',
816 ], 816 ],
817 'message': 'Unpacking and repacking to <@(_outputs)', 817 'message': 'Unpacking and repacking to <@(_outputs)',
818 }, 818 },
819 ], 819 ],
820 }, # end of target 'remoting_host_installation_unittest' 820 }, # end of target 'remoting_host_installation_unittest'
821 ], # end of 'targets' 821 ], # end of 'targets'
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1845 '../base/allocator/allocator.gyp:allocator', 1845 '../base/allocator/allocator.gyp:allocator',
1846 ], 1846 ],
1847 }, 1847 },
1848 ], 1848 ],
1849 ], 1849 ],
1850 }], 1850 }],
1851 ], # end of 'conditions' 1851 ], # end of 'conditions'
1852 }, # end of target 'remoting_unittests' 1852 }, # end of target 'remoting_unittests'
1853 ], # end of targets 1853 ], # end of targets
1854 } 1854 }
OLDNEW
« no previous file with comments | « remoting/host/win/chromoting.wxs ('k') | remoting/tools/candle_and_light.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698