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

Side by Side Diff: remoting/remoting.gyp

Issue 10673011: sas.dll is not included to Windows 8 SDK. Use one from from Windows 7 SDK instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« build/common.gypi ('K') | « remoting/candle_and_light.py ('k') | no next file » | 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 # Use consistent strings across all platforms. Note that the plugin name 10 # Use consistent strings across all platforms. Note that the plugin name
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 ], 670 ],
671 }, # end of target 'remoting_version_resources' 671 }, # end of target 'remoting_version_resources'
672 ], # end of 'targets' 672 ], # end of 'targets'
673 }], # 'OS=="win"' 673 }], # 'OS=="win"'
674 674
675 # The host installation is generated only if WiX is available and when 675 # The host installation is generated only if WiX is available and when
676 # building a non-component build. WiX does not provide a easy way to 676 # building a non-component build. WiX does not provide a easy way to
677 # include all DLLs imported by the installed binaries, so supporting 677 # include all DLLs imported by the installed binaries, so supporting
678 # the component build becomes a burden. 678 # the component build becomes a burden.
679 ['OS == "win" and component != "shared_library" and wix_exists == "True" \ 679 ['OS == "win" and component != "shared_library" and wix_exists == "True" \
680 and platformsdk_exists == "True"', { 680 and sas_dll_exists == "True"', {
681 'targets': [ 681 'targets': [
682 { 682 {
683 'target_name': 'remoting_host_installation', 683 'target_name': 'remoting_host_installation',
684 'type': 'none', 684 'type': 'none',
685 'dependencies': [ 685 'dependencies': [
686 'remoting_host_controller', 686 'remoting_host_controller',
687 'remoting_service', 687 'remoting_service',
688 'remoting_me2me_host', 688 'remoting_me2me_host',
689 ], 689 ],
690 'sources': [ 690 'sources': [
(...skipping 13 matching lines...) Expand all
704 }], 704 }],
705 ], 705 ],
706 'rules': [ 706 'rules': [
707 { 707 {
708 'rule_name': 'candle_and_light', 708 'rule_name': 'candle_and_light',
709 'extension': 'wxs', 709 'extension': 'wxs',
710 'inputs': [ 710 'inputs': [
711 '<(PRODUCT_DIR)/remoting_host_controller.exe', 711 '<(PRODUCT_DIR)/remoting_host_controller.exe',
712 '<(PRODUCT_DIR)/remoting_me2me_host.exe', 712 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
713 '<(PRODUCT_DIR)/remoting_service.exe', 713 '<(PRODUCT_DIR)/remoting_service.exe',
714 '<(platformsdk_path)/redist/x86/sas.dll', 714 '<(sas_dll_path)/sas.dll',
715 'resources/chromoting.ico', 715 'resources/chromoting.ico',
716 'candle_and_light.py', 716 'candle_and_light.py',
717 ], 717 ],
718 'outputs': [ 718 'outputs': [
719 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', 719 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
720 ], 720 ],
721 'msvs_cygwin_shell': 0, 721 'msvs_cygwin_shell': 0,
722 'action': [ 722 'action': [
723 'python', 'candle_and_light.py', 723 'python', 'candle_and_light.py',
724 '--wix_path', '<(wix_path)', 724 '--wix_path', '<(wix_path)',
725 '--version', '<(version_full)', 725 '--version', '<(version_full)',
726 '--product_dir', '<(PRODUCT_DIR).', 726 '--product_dir', '<(PRODUCT_DIR).',
727 '--intermediate_dir', '<(INTERMEDIATE_DIR).', 727 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
728 '--platformsdk_path', '<(platformsdk_path)', 728 '--sas_dll_path', '<(sas_dll_path)',
729 '--input', '<(RULE_INPUT_PATH)', 729 '--input', '<(RULE_INPUT_PATH)',
730 '--output', '<@(_outputs)', 730 '--output', '<@(_outputs)',
731 '<@(_wix_defines)', 731 '<@(_wix_defines)',
732 ], 732 ],
733 'message': 'Generating <@(_outputs)', 733 'message': 'Generating <@(_outputs)',
734 }, 734 },
735 ], 735 ],
736 }, # end of target 'remoting_host_installation' 736 }, # end of target 'remoting_host_installation'
737 737
738 # The 'remoting_host_installation_unittest' target is used to make sure 738 # The 'remoting_host_installation_unittest' target is used to make sure
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1767 '../base/allocator/allocator.gyp:allocator', 1767 '../base/allocator/allocator.gyp:allocator',
1768 ], 1768 ],
1769 }, 1769 },
1770 ], 1770 ],
1771 ], 1771 ],
1772 }], 1772 }],
1773 ], # end of 'conditions' 1773 ], # end of 'conditions'
1774 }, # end of target 'remoting_unittests' 1774 }, # end of target 'remoting_unittests'
1775 ], # end of targets 1775 ], # end of targets
1776 } 1776 }
OLDNEW
« build/common.gypi ('K') | « remoting/candle_and_light.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698