diff options
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 01e5bea..02910e9 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -118,6 +118,12 @@ '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', @@ -510,6 +516,9 @@ { 'target_name': 'remoting_elevated_controller', 'type': 'static_library', + 'defines' : [ + 'DAEMON_CONTROLLER_CLSID=<(daemon_controller_clsid)', + ], 'sources': [ 'host/win/elevated_controller.idl', '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h', @@ -538,6 +547,7 @@ '_ATL_NO_AUTOMATIC_NAMESPACE', '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS', 'STRICT', + 'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"', ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -761,6 +771,7 @@ '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).', |