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

Side by Side Diff: remoting/remoting.gyp

Issue 12543006: Build src/remoting/remoting.gyp:remoting_host_installation on the main waterfall. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build the installer even if component build is used. Created 7 years, 9 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 | « build/all.gyp ('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 10
(...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 '<(template_input_path)', 1661 '<(template_input_path)',
1662 '<@(_outputs)', 1662 '<@(_outputs)',
1663 ], 1663 ],
1664 'message': 'Generating version information in <@(_outputs)' 1664 'message': 'Generating version information in <@(_outputs)'
1665 }, 1665 },
1666 ], 1666 ],
1667 }, # end of target 'remoting_version_resources' 1667 }, # end of target 'remoting_version_resources'
1668 ], # end of 'targets' 1668 ], # end of 'targets'
1669 }], # 'OS=="win"' 1669 }], # 'OS=="win"'
1670 1670
1671 # The host installation is generated only if WiX is available and when 1671 # The host installation is generated only if WiX is available. If
1672 # building a non-component build. WiX does not provide a easy way to 1672 # component build is used the produced installation will not work due to
1673 # include all DLLs imported by the installed binaries, so supporting 1673 # missing DLLs. We build it anyway to make sure the GYP scripts are executed
1674 # the component build becomes a burden. 1674 # by the bots.
1675 ['OS == "win" and component != "shared_library" and wix_exists == "True" \ 1675 ['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', {
1676 and sas_dll_exists == "True"', {
1677 'targets': [ 1676 'targets': [
1678 { 1677 {
1679 'target_name': 'remoting_host_installation', 1678 'target_name': 'remoting_host_installation',
1680 'type': 'none', 1679 'type': 'none',
1681 'dependencies': [ 1680 'dependencies': [
1682 'remoting_me2me_host_archive', 1681 'remoting_me2me_host_archive',
1683 ], 1682 ],
1684 'sources': [ 1683 'sources': [
1685 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', 1684 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
1686 ], 1685 ],
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
2625 '../base/allocator/allocator.gyp:allocator', 2624 '../base/allocator/allocator.gyp:allocator',
2626 ], 2625 ],
2627 }, 2626 },
2628 ], 2627 ],
2629 ], 2628 ],
2630 }], # end of 'toolkit_uses_gtk == 1' 2629 }], # end of 'toolkit_uses_gtk == 1'
2631 ], # end of 'conditions' 2630 ], # end of 'conditions'
2632 }, # end of target 'remoting_unittests' 2631 }, # end of target 'remoting_unittests'
2633 ], # end of targets 2632 ], # end of targets
2634 } 2633 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698