diff options
| -rw-r--r-- | remoting/host/installer/win/chromoting.wxs | 35 | ||||
| -rw-r--r-- | remoting/remoting_host.gypi | 3 | ||||
| -rw-r--r-- | remoting/remoting_host_win.gypi | 5 |
3 files changed, 41 insertions, 2 deletions
diff --git a/remoting/host/installer/win/chromoting.wxs b/remoting/host/installer/win/chromoting.wxs index 3866df4..d6b5557 100644 --- a/remoting/host/installer/win/chromoting.wxs +++ b/remoting/host/installer/win/chromoting.wxs @@ -196,6 +196,14 @@ Vital="yes"/> </Component> + <Component Id="remote_assistance_host" Guid="*"> + <File Id="remote_assistance_host.exe" + DiskId="1" + KeyPath="yes" + Name="remote_assistance_host.exe" + Vital="yes"/> + </Component> + <Component Id="native_messaging_host_manifest" Guid="*"> <File Id="com.google.chrome.remote_desktop.json" DiskId="1" @@ -204,6 +212,14 @@ Vital="yes"/> </Component> + <Component Id="remote_assistance_host_manifest" Guid="*"> + <File Id="com.google.chrome.remote_assistance.json" + DiskId="1" + KeyPath="yes" + Name="com.google.chrome.remote_assistance.json" + Vital="yes"/> + </Component> + <Component Id="icudtl" Guid="*"> <File Id="icudtl.dat" DiskId="1" @@ -535,6 +551,20 @@ <CreateFolder/> </Component> + <Component Id="remote_assistance_host_registry" Guid="*"> + <RegistryKey Root="HKLM" + Key="SOFTWARE\Google\chrome\NativeMessagingHosts" + Action="create"> + <RegistryKey Key="com.google.chrome.remote_assistance" + Action="create"> + <RegistryValue + Type="string" + Value="[binaries]com.google.chrome.remote_assistance.json"/> + </RegistryKey> + </RegistryKey> + <CreateFolder/> + </Component> + <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. --> <Component Id="sawbuck_provider" Guid="*"> <RegistryKey Root="HKLM" @@ -635,9 +665,12 @@ <ComponentRef Id="omaha_registration"/> <?endif?> <ComponentRef Id="icudtl"/> - <ComponentRef Id="remoting_native_messaging_host"/> <ComponentRef Id="native_messaging_host_manifest"/> <ComponentRef Id="native_messaging_host_registry"/> + <ComponentRef Id="remote_assistance_host"/> + <ComponentRef Id="remote_assistance_host_manifest"/> + <ComponentRef Id="remote_assistance_host_registry"/> + <ComponentRef Id="remoting_native_messaging_host"/> <ComponentRef Id="remoting_core"/> <ComponentRef Id="remoting_desktop"/> <ComponentRef Id="remoting_host"/> diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index 6284b30..93f7cf0 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -608,6 +608,7 @@ ], }], ['OS=="win"', { + 'product_name': 'remote_assistance_host', 'msvs_settings': { 'VCManifestTool': { 'EmbedManifest': 'true', @@ -634,7 +635,7 @@ [ 'OS == "win"', { 'variables': { 'me2me_host_path': 'remoting_native_messaging_host.exe', - 'it2me_host_path': 'remoting_assistance_host.exe', + 'it2me_host_path': 'remote_assistance_host.exe', }, }], [ 'OS == "mac"', { diff --git a/remoting/remoting_host_win.gypi b/remoting/remoting_host_win.gypi index 4e24861..faeb3de 100644 --- a/remoting/remoting_host_win.gypi +++ b/remoting/remoting_host_win.gypi @@ -465,16 +465,19 @@ 'remoting_core', 'remoting_desktop', 'remoting_host_exe', + 'remoting_it2me_native_messaging_host', 'remoting_me2me_native_messaging_host', 'remoting_native_messaging_manifests', ], 'compiled_inputs': [ + '<(PRODUCT_DIR)/remote_assistance_host.exe', '<(PRODUCT_DIR)/remoting_core.dll', '<(PRODUCT_DIR)/remoting_desktop.exe', '<(PRODUCT_DIR)/remoting_host.exe', '<(PRODUCT_DIR)/remoting_native_messaging_host.exe', ], 'compiled_inputs_dst': [ + 'files/remote_assistance_host.exe', 'files/remoting_core.dll', 'files/remoting_desktop.exe', 'files/remoting_host.exe', @@ -500,6 +503,7 @@ 'generated_files': [ '<@(_compiled_inputs)', '<(sas_dll_path)/sas.dll', + '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json', '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', 'resources/chromoting.ico', '<(PRODUCT_DIR)/icudtl.dat', @@ -507,6 +511,7 @@ 'generated_files_dst': [ '<@(_compiled_inputs_dst)', 'files/sas.dll', + 'files/com.google.chrome.remote_assistance.json', 'files/com.google.chrome.remote_desktop.json', 'files/chromoting.ico', 'files/icudtl.dat', |