| 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 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1695 '<(template_input_path)', | 1695 '<(template_input_path)', |
| 1696 '<@(_outputs)', | 1696 '<@(_outputs)', |
| 1697 ], | 1697 ], |
| 1698 'message': 'Generating version information in <@(_outputs)' | 1698 'message': 'Generating version information in <@(_outputs)' |
| 1699 }, | 1699 }, |
| 1700 ], | 1700 ], |
| 1701 }, # end of target 'remoting_version_resources' | 1701 }, # end of target 'remoting_version_resources' |
| 1702 ], # end of 'targets' | 1702 ], # end of 'targets' |
| 1703 }], # 'OS=="win"' | 1703 }], # 'OS=="win"' |
| 1704 | 1704 |
| 1705 # The host installation is generated only if WiX is available. If | 1705 # The host installation is generated only if WiX is available and when |
| 1706 # component build is used the produced installation will not work due to | 1706 # building a non-component build. WiX does not provide a easy way to |
| 1707 # missing DLLs. We build it anyway to make sure the GYP scripts are executed | 1707 # include all DLLs imported by the installed binaries, so supporting |
| 1708 # by the bots. | 1708 # the component build becomes a burden. |
| 1709 ['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', { | 1709 ['OS == "win" and component != "shared_library" and wix_exists == "True" \ |
| 1710 and sas_dll_exists == "True"', { |
| 1710 'targets': [ | 1711 'targets': [ |
| 1711 { | 1712 { |
| 1712 'target_name': 'remoting_host_installation', | 1713 'target_name': 'remoting_host_installation', |
| 1713 'type': 'none', | 1714 'type': 'none', |
| 1714 'dependencies': [ | 1715 'dependencies': [ |
| 1715 'remoting_me2me_host_archive', | 1716 'remoting_me2me_host_archive', |
| 1716 ], | 1717 ], |
| 1717 'sources': [ | 1718 'sources': [ |
| 1718 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', | 1719 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', |
| 1719 ], | 1720 ], |
| (...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2658 '../base/allocator/allocator.gyp:allocator', | 2659 '../base/allocator/allocator.gyp:allocator', |
| 2659 ], | 2660 ], |
| 2660 }, | 2661 }, |
| 2661 ], | 2662 ], |
| 2662 ], | 2663 ], |
| 2663 }], # end of 'toolkit_uses_gtk == 1' | 2664 }], # end of 'toolkit_uses_gtk == 1' |
| 2664 ], # end of 'conditions' | 2665 ], # end of 'conditions' |
| 2665 }, # end of target 'remoting_unittests' | 2666 }, # end of target 'remoting_unittests' |
| 2666 ], # end of targets | 2667 ], # end of targets |
| 2667 } | 2668 } |
| OLD | NEW |