OLD | NEW |
---|---|
1 <?xml version="1.0"?> | 1 <?xml version="1.0"?> |
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | 2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
3 | 3 |
4 <?define EventSourceName = "chromoting" ?> | 4 <?define EventSourceName = "chromoting" ?> |
5 <?define ServiceName = "chromoting" ?> | 5 <?define ServiceName = "chromoting" ?> |
6 | 6 |
7 <!-- TODO(alexeypa): There strings should be localized, | 7 <!-- TODO(alexeypa): There strings should be localized, |
8 see http://crbug.com/121785 --> | 8 see http://crbug.com/121785 --> |
9 <?if $(var.Branding) ~= Chrome ?> | 9 <?if $(var.Branding) ~= Chrome ?> |
10 <?define ChromotingHost = "Chrome Remote Desktop Host" ?> | 10 <?define ChromotingHost = "Chrome Remote Desktop Host" ?> |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
128 <Directory Id="common_app_data_google" Name="Google"> | 128 <Directory Id="common_app_data_google" Name="Google"> |
129 <Directory Id="config_files" Name="Chrome Remote Desktop"/> | 129 <Directory Id="config_files" Name="Chrome Remote Desktop"/> |
130 </Directory> | 130 </Directory> |
131 <?else?> | 131 <?else?> |
132 <Directory Id="config_files" Name="Chromoting"/> | 132 <Directory Id="config_files" Name="Chromoting"/> |
133 <?endif?> | 133 <?endif?> |
134 </Directory> | 134 </Directory> |
135 </Directory> | 135 </Directory> |
136 | 136 |
137 <DirectoryRef Id="binaries" FileSource="$(var.FileSource)"> | 137 <DirectoryRef Id="binaries" FileSource="$(var.FileSource)"> |
138 <Component Id="sas.dll" Guid="*"> | 138 <Component Id="sas" Guid="*"> |
139 <File Id="sas.dll" | 139 <File Id="sas.dll" |
140 DiskId="1" | 140 DiskId="1" |
141 Name="sas.dll" | 141 Name="sas.dll" |
142 Source="$(var.SasDllPath)" | 142 Source="$(var.SasDllPath)" |
143 Vital="yes"/> | 143 Vital="yes"/> |
144 </Component> | 144 </Component> |
145 | 145 |
146 <Component Id="remoting_service" Guid="*"> | 146 <?ifdef RemotingMultiProcess ?> |
147 <Component Id="remoting_desktop" Guid="*"> | |
148 <File Id="remoting_desktop.exe" | |
garykac
2012/09/05 22:40:42
Shouldn't these targets be called _daemon as well?
alexeypa (please no reviews)
2012/09/05 23:24:02
No, this one is installing the desktop integration
| |
149 DiskId="1" | |
150 KeyPath="yes" | |
151 Name="remoting_desktop.exe" | |
152 Vital="yes"/> | |
153 </Component> | |
154 <?endif?> | |
155 | |
156 <Component Id="remoting_daemon" Guid="*"> | |
147 <File Id="remoting_service.exe" | 157 <File Id="remoting_service.exe" |
148 DiskId="1" | 158 DiskId="1" |
149 KeyPath="yes" | 159 KeyPath="yes" |
150 Name="remoting_service.exe" | 160 Name="remoting_service.exe" |
151 Vital="yes"/> | 161 Vital="yes"/> |
152 | 162 |
153 <ServiceInstall Id="install_service" | 163 <ServiceInstall Id="install_service" |
154 Type="ownProcess" | 164 Type="ownProcess" |
155 Vital="yes" | 165 Vital="yes" |
156 Name="$(var.ServiceName)" | 166 Name="$(var.ServiceName)" |
157 DisplayName="[chromoting_service_display_name]" | 167 DisplayName="[chromoting_service_display_name]" |
158 Description="[chromoting_service_description]" | 168 Description="[chromoting_service_description]" |
159 Arguments="--host-config="[config_files]host.json&q uot;" | 169 Arguments="--host-config="[config_files]host.json&q uot;" |
160 Start="demand" | 170 Start="demand" |
161 Account="LocalSystem" | 171 Account="LocalSystem" |
162 ErrorControl="ignore" | 172 ErrorControl="ignore" |
163 Interactive="no" /> | 173 Interactive="no" /> |
164 | 174 |
165 <ServiceControl Id="start_service" | 175 <ServiceControl Id="start_service" |
166 Stop="both" | 176 Stop="both" |
167 Remove="uninstall" | 177 Remove="uninstall" |
168 Name="$(var.ServiceName)" | 178 Name="$(var.ServiceName)" |
169 Wait="yes" /> | 179 Wait="yes" /> |
170 </Component> | 180 </Component> |
171 | 181 |
172 <Component Id="remoting_me2me_host" Guid="*"> | 182 <Component Id="remoting_host" Guid="*"> |
garykac
2012/09/05 22:40:42
Why not remoting_host_me2me?
alexeypa (please no reviews)
2012/09/05 23:24:02
Done.
alexeypa (please no reviews)
2012/09/05 23:26:09
Actually - not done, since Sergey suggested to avo
| |
173 <File Id="remoting_me2me_host.exe" | 183 <File Id="remoting_me2me_host.exe" |
174 DiskId="1" | 184 DiskId="1" |
175 Name="remoting_me2me_host.exe" | 185 Name="remoting_me2me_host.exe" |
176 Vital="yes"/> | 186 Vital="yes"/> |
177 <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExten sion" | 187 <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExten sion" |
178 Name="$(var.EventSourceName)" | 188 Name="$(var.EventSourceName)" |
179 Log="Application" | 189 Log="Application" |
180 CategoryCount="1" | 190 CategoryCount="1" |
181 CategoryMessageFile="[#remoting_me2me_host.exe]" | 191 CategoryMessageFile="[#remoting_me2me_host.exe]" |
182 EventMessageFile="[#remoting_me2me_host.exe]" | 192 EventMessageFile="[#remoting_me2me_host.exe]" |
(...skipping 19 matching lines...) Expand all Loading... | |
202 Name="pv" | 212 Name="pv" |
203 Value="$(var.Version)"/> | 213 Value="$(var.Version)"/> |
204 | 214 |
205 <RegistryValue Type="string" | 215 <RegistryValue Type="string" |
206 Name="name" | 216 Name="name" |
207 Value="$(var.ChromotingHost)"/> | 217 Value="$(var.ChromotingHost)"/> |
208 </RegistryKey> | 218 </RegistryKey> |
209 </Component> | 219 </Component> |
210 <?endif?> | 220 <?endif?> |
211 | 221 |
212 <Component Id="service_controller" Guid="*"> | 222 <Component Id="remoting_controller" Guid="*"> |
213 <File Id="$(var.ControllerBinary)" | 223 <File Id="$(var.ControllerBinary)" |
214 DiskId="1" | 224 DiskId="1" |
215 Name="$(var.ControllerBinary)" | 225 Name="$(var.ControllerBinary)" |
216 Vital="yes"/> | 226 Vital="yes"/> |
217 | 227 |
218 <RegistryKey Root="HKLM" | 228 <RegistryKey Root="HKLM" |
219 Key="SOFTWARE\Classes"> | 229 Key="SOFTWARE\Classes"> |
220 <RegistryKey Key="AppId"> | 230 <RegistryKey Key="AppId"> |
221 <RegistryKey Key="$(var.ControllerAppid)" Action="create"> | 231 <RegistryKey Key="$(var.ControllerAppid)" Action="create"> |
222 <RegistryValue Type="string" | 232 <RegistryValue Type="string" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
402 <CustomAction Id="set_service_description_xp" | 412 <CustomAction Id="set_service_description_xp" |
403 Property="chromoting_service_description" | 413 Property="chromoting_service_description" |
404 Value="$(var.ChromotingServiceDescription)" /> | 414 Value="$(var.ChromotingServiceDescription)" /> |
405 | 415 |
406 <UIRef Id="WixUI_ErrorProgressText" /> | 416 <UIRef Id="WixUI_ErrorProgressText" /> |
407 | 417 |
408 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> | 418 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> |
409 <?ifdef OfficialBuild ?> | 419 <?ifdef OfficialBuild ?> |
410 <ComponentRef Id="omaha_registration"/> | 420 <ComponentRef Id="omaha_registration"/> |
411 <?endif?> | 421 <?endif?> |
412 <ComponentRef Id="remoting_me2me_host"/> | 422 <ComponentRef Id="remoting_controller"/> |
413 <ComponentRef Id="remoting_service"/> | 423 <ComponentRef Id="remoting_daemon"/> |
414 <ComponentRef Id="sas.dll"/> | 424 <?ifdef RemotingMultiProcess ?> |
415 <ComponentRef Id="service_controller"/> | 425 <ComponentRef Id="remoting_desktop"/> |
426 <?endif?> | |
427 <ComponentRef Id="remoting_host"/> | |
428 <ComponentRef Id="sas"/> | |
416 </Feature> | 429 </Feature> |
417 | 430 |
418 <!-- Set the icon shown in Add/Remove Programs. --> | 431 <!-- Set the icon shown in Add/Remove Programs. --> |
419 <Icon Id="chromoting.ico" SourceFile="$(var.IconPath)"/> | 432 <Icon Id="chromoting.ico" SourceFile="$(var.IconPath)"/> |
420 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" /> | 433 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" /> |
421 | 434 |
422 <InstallExecuteSequence> | 435 <InstallExecuteSequence> |
423 <Custom Action="query_auto_start_service" Before="InstallInitialize"/> | 436 <Custom Action="query_auto_start_service" Before="InstallInitialize"/> |
424 <Custom Action="set_auto_start_service" After="StartServices"> | 437 <Custom Action="set_auto_start_service" After="StartServices"> |
425 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]> | 438 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]> |
(...skipping 12 matching lines...) Expand all Loading... | |
438 <Custom Action="set_service_description" Before="InstallInitialize"> | 451 <Custom Action="set_service_description" Before="InstallInitialize"> |
439 <![CDATA[VersionNT >= 600]]> | 452 <![CDATA[VersionNT >= 600]]> |
440 </Custom> | 453 </Custom> |
441 | 454 |
442 <!-- Schedule RemoveExistingProducts before installing any files. | 455 <!-- Schedule RemoveExistingProducts before installing any files. |
443 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> | 456 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> |
444 <RemoveExistingProducts After="InstallInitialize" /> | 457 <RemoveExistingProducts After="InstallInitialize" /> |
445 </InstallExecuteSequence> | 458 </InstallExecuteSequence> |
446 </Product> | 459 </Product> |
447 </Wix> | 460 </Wix> |
OLD | NEW |