[Chromoting] Avoid potential conflicts leading to pending reboots while upgrading the me2me host:

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 100 matching lines @@
           'webapp/_locales.official/zh_CN/messages.json',
           'webapp/_locales.official/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
         # Must match host/plugin/constants.h
         'host_plugin_name': 'Chromoting Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales/en/messages.json',
         ],
       }],
+      ['OS=="win"', {
+        # Use auto-generated CLSID for the daemon controller to make sure that
+        # the newly installed version of the controller will be used during
+        # upgrade even if there is an old instance running already.
+        'daemon_controller_clsid': '<!(python tools/uuidgen.py)',
+      }],
     ],
     'remoting_webapp_files': [
       'resources/chromoting16.png',
       'resources/chromoting48.png',
       'resources/chromoting128.png',
       'resources/disclosure_arrow_down.png',
       'resources/disclosure_arrow_right.png',
       'resources/host_setup_instructions.png',
       'resources/icon_cross.png',
       'resources/icon_host.png',
@@ skipping 375 matching lines @@
           ],
           'sources': [
             'tools/breakpad_tester_win.cc',
           ],
         },  # end of target 'remoting_breakpad_tester'
 
         {
           'target_name': 'remoting_elevated_controller',
           'type': 'static_library',
           'sources': [
-            'host/win/elevated_controller.idl',
+            'host/win/elevated_controller_idl.templ',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller_i.c',
           ],
           # This target exports a hard dependency because dependent targets may
           # include elevated_controller.h, a generated header.
           'hard_dependency': 1,
           'msvs_settings': {
             'VCMIDLTool': {
               'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/remoting/host',
             },
           },
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
+          'rules': [
+            {
+              'rule_name': 'generate_idl',
+              'extension': 'templ',
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/host/<(RULE_INPUT_PATH).idl',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"',
+                '<(RULE_INPUT_PATH)',
+                '<@(_outputs)',
+              ],
+              'process_outputs_as_sources': 1,
+              'message': 'Generating <@(_outputs)'
+            },
+          ],
         },  # end of target 'remoting_elevated_controller'
+

[Jamie, 2012/08/16 18:18:47]

Nit: We don't tend to have many blank lines in gyp files.

[alexeypa (please no reviews), 2012/08/16 18:35:59]

OK, but our gyp files tend to be unreadable too.

         {
           'target_name': 'remoting_host_controller',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'defines' : [
             '_ATL_APARTMENT_THREADED',
             '_ATL_NO_AUTOMATIC_NAMESPACE',
             '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
             'STRICT',
+            'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_breakpad',
             'remoting_elevated_controller',
             'remoting_protocol',
             'remoting_version_resources',
@@ skipping 25 matching lines @@
                     "name='Microsoft.Windows.Common-Controls' "
                     "version='6.0.0.0' "
                     "processorArchitecture='*' "
                     "publicKeyToken='6595b64144ccf1df' language='*'\"",
               ],
               # 2 == /SUBSYSTEM:WINDOWS
               'SubSystem': '2',
             },
           },
         },  # end of target 'remoting_host_controller'
+

[Jamie, 2012/08/16 18:18:47]

Nit: Blank line.

[alexeypa (please no reviews), 2012/08/16 18:35:59]

Done.

         {
           'target_name': 'remoting_service',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
             'remoting_base',
@@ skipping 160 matching lines @@
                 'resources/chromoting.ico',
                 '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)}',
                 '--version', '<(version_full)',
                 '--product_dir', '<(PRODUCT_DIR).',
                 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
                 '--sas_dll_path', '<(sas_dll_path)',
                 '--input', '<(RULE_INPUT_PATH)',
                 '--output', '<@(_outputs)',
                 '<@(_wix_defines)',
               ],
               'message': 'Generating <@(_outputs)',
             },
@@ skipping 1080 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }