[Chromoting] Adding the desktop integration binary to the host installation on Windows.

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 11 matching lines @@
     'version_short':
       '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
       '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")',
 
     'branding_path': '../remoting/branding_<(branding)',
     'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COPYRIGHT@")',
 
     # Use consistent strings across all platforms.
     # These values must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
-    'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_DESCRIPTION@")',
+    'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")',
     'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
 
     'conditions': [
       ['OS=="mac"', {
         'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_BUNDLE_ID@")',
         'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_CREATOR@")',
         'host_plugin_extension': 'plugin',
         'host_plugin_prefix': '',
       }],
       ['os_posix == 1 and OS != "mac" and target_arch == "ia32"', {
@@ skipping 157 matching lines @@
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
     'conditions': [
       ['remoting_audio == 1', {
         'defines': [
           'ENABLE_REMOTING_AUDIO',
         ],
       }],
-      ['remoting_multi_process == 1', {
+      ['remoting_multi_process != 0', {
         'defines': [
           'REMOTING_MULTI_PROCESS',
         ],
       }],
     ],
   },
 
   'conditions': [
     ['OS=="linux"', {
       'targets': [
@@ skipping 82 matching lines @@
             'remoting_host_prefpane',
             'remoting_host_uninstaller',
             'remoting_me2me_host',
           ],
           'sources': [
             'host/installer/build-installer-archive.py',
             '<@(remoting_host_installer_mac_files)',
           ],
           'variables': {
             'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
-            'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_SERVICE_FILE_NAME@")',
+            'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@DAEMON_FILE_NAME@")',
             'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_NAME@")',
             'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")',
           },
           'actions': [
             {
               'action_name': 'Zip installer files for signing',
               'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-host',
               'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
               'variables': {
                 'host_name_nospace': '<!(echo <(host_name) | sed "s/ //g")',
@@ skipping 320 matching lines @@
             '<(version_path)',
             '<(chrome_version_path)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/remoting',
             ],
           },
           'sources': [
             'host/plugin/host_plugin.ver',
+            'host/remoting_desktop.ver',
             'host/remoting_me2me_host.ver',
             'host/win/elevated_controller.ver',

[garykac, 2012/09/05 22:40:42]

controller.ver?

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Done.

             'host/win/host_service.ver',

[garykac, 2012/09/05 22:40:42]

daemon.ver?

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Done.

           ],
           'rules': [
             {
               'rule_name': 'version',
               'extension': 'ver',
               'variables': {
                 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
                 'template_input_path': 'version.rc.version',
               },
               'inputs': [
@@ skipping 40 matching lines @@
             'remoting_me2me_host',
           ],
           'sources': [
             'host/win/chromoting.wxs',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/chromoting.msi',
           ],
           'wix_defines' : [
             '-dBranding=<(branding)',
+            '-dRemotingMultiProcess=<(remoting_multi_process)',
+          ],
+          'wix_inputs' : [
+            '<(PRODUCT_DIR)/remoting_host_controller.exe',

[garykac, 2012/09/05 22:40:42]

remoting_controller?

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Cannot touch file names yet.

+            '<(PRODUCT_DIR)/remoting_me2me_host.exe',

[garykac, 2012/09/05 22:40:42]

remoting_host_me2me for consistency with you renaming this elsewhere

[Sergey Ulanov, 2012/09/05 23:03:57]

FYI on linux we renamed main host binary to chrome-remote-desktop-host. Maybe
use the same name here for consistency. Or remoting_host.exe should work fine.
It's best to avoid using "me2me" as part of the name.

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Cannot touch file names yet.

+            '<(PRODUCT_DIR)/remoting_service.exe',
+            '<(sas_dll_path)/sas.dll',
+            'resources/chromoting.ico',
           ],
           'conditions': [
+            ['remoting_multi_process != 0', {
+              'dependencies': [
+                'remoting_desktop',
+              ],
+              'wix_inputs' : [
+                '<(PRODUCT_DIR)/remoting_desktop.exe',
+              ],
+            }],
             ['buildtype == "Official"', {
               'wix_defines': [
                 '-dOfficialBuild=1',
               ],
             }],
           ],
           'rules': [
             {
               'rule_name': 'candle_and_light',
               'extension': 'wxs',
               'inputs': [
-                '<(PRODUCT_DIR)/remoting_host_controller.exe',
-                '<(PRODUCT_DIR)/remoting_me2me_host.exe',
-                '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(sas_dll_path)/sas.dll',
-                'resources/chromoting.ico',
+                '<@(_wix_inputs)',
                 'tools/candle_and_light.py',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
               ],
               'msvs_cygwin_shell': 0,
               'action': [
                 'python', 'tools/candle_and_light.py',
                 '--wix_path', '<(wix_path)',
                 '--controller_clsid', '{<(daemon_controller_clsid)}',
@@ skipping 50 matching lines @@
                 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
                 '--output', '<@(_outputs)',
               ],
               'message': 'Unpacking and repacking to <@(_outputs)',
             },
           ],
         },  # end of target 'remoting_host_installation_unittest'
       ],  # end of 'targets'
     }],  # '<(wix_path) != ""'
 
+    ['remoting_multi_process != 0', {
+      'targets': [
+        {
+          'target_name': 'remoting_desktop',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'remoting_base',
+            'remoting_breakpad',
+            'remoting_host',
+            'remoting_version_resources',
+            '../base/base.gyp:base',
+            '../ipc/ipc.gyp:ipc',
+          ],
+          'sources': [
+            'host/branding.cc',
+            'host/branding.h',
+            'host/desktop_process.cc',
+            'host/desktop_process.h',
+            'host/host_ui.rc',
+            'host/usage_stats_consent.h',
+            'host/usage_stats_consent_win.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalOptions': [
+                "\"/manifestdependency:type='win32' "
+                    "name='Microsoft.Windows.Common-Controls' "
+                    "version='6.0.0.0' "
+                    "processorArchitecture='*' "
+                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
+              ],
+              'conditions': [
+                ['buildtype == "Official" and remoting_multi_process != 0', {
+                  'AdditionalOptions': [
+                    "\"/MANIFESTUAC:level='requireAdministrator' "
+                        "uiAccess='true'\"",
+                  ],
+                }],
+              ],
+              # 2 == /SUBSYSTEM:WINDOWS
+              'SubSystem': '2',
+            },
+          },
+        },  # end of target 'remoting_desktop'
+      ],
+    }],  # 'remoting_multi_process != 0'
+
   ],  # end of 'conditions'
 
   'targets': [
     {
       'target_name': 'remoting_breakpad',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
       ],
@@ skipping 679 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
                 "\"/manifestdependency:type='win32' "
                     "name='Microsoft.Windows.Common-Controls' "
                     "version='6.0.0.0' "
                     "processorArchitecture='*' "
                     "publicKeyToken='6595b64144ccf1df' language='*'\"",
               ],
               'conditions': [
-                ['buildtype == "Official"', {
+                ['buildtype == "Official" and remoting_multi_process == 0', {
                   'AdditionalOptions': [
                     "\"/MANIFESTUAC:level='requireAdministrator' "
                         "uiAccess='true'\"",
                   ],
                 }],
               ],
               # 2 == /SUBSYSTEM:WINDOWS
               'SubSystem': '2',
             },
           },
@@ skipping 324 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }