Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Side by Side Diff: remoting/host/installer/win/chromoting.wxs

Issue 12092117: Merged all Chromoting Host code into remoting_core.dll (Windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/host_ui_resource.h ('k') | remoting/host/installer/win/parameters.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" ?>
11 <?define ChromotingServiceName = "Chrome Remote Desktop Service" ?> 11 <?define ChromotingServiceName = "Chrome Remote Desktop Service" ?>
12 <?define ChromotingServiceDescription = "This service enables incoming conne ctions from Chrome Remote Desktop clients." ?> 12 <?define ChromotingServiceDescription = "This service enables incoming conne ctions from Chrome Remote Desktop clients." ?>
13 <?define Manufacturer = "Google Inc." ?> 13 <?define Manufacturer = "Google Inc." ?>
14 <?else?> 14 <?else?>
15 <?define ChromotingHost = "Chromoting Host" ?> 15 <?define ChromotingHost = "Chromoting Host" ?>
16 <?define ChromotingServiceName = "Chromoting Service" ?> 16 <?define ChromotingServiceName = "Chromoting Service" ?>
17 <?define ChromotingServiceDescription = "This service enables incoming conne ctions from Chromoting clients." ?> 17 <?define ChromotingServiceDescription = "This service enables incoming conne ctions from Chromoting clients." ?>
18 <?define Manufacturer = "The Chromium Authors" ?> 18 <?define Manufacturer = "The Chromium Authors" ?>
19 <?endif?> 19 <?endif?>
20 20
21 <?define FirewallName = "$(var.ChromotingHost)" ?> 21 <?define FirewallName = "$(var.ChromotingHost)" ?>
22 22
23 <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?> 23 <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>
24 <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?> 24 <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?>
25 25
26 <?define CoreBinary = "remoting_core.dll" ?>
27
26 <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?> 28 <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
27 <?define ControllerBinary = "remoting_controller.exe" ?> 29 <?define ControllerBinary = "remoting_controller.exe" ?>
28 <?define ControllerClass = "ElevatedController Class" ?> 30 <?define ControllerClass = "ElevatedController Class" ?>
29 <?define ControllerProgid = 31 <?define ControllerProgid =
30 "ChromotingElevatedController.ElevatedController" ?> 32 "ChromotingElevatedController.ElevatedController" ?>
31 <?define ControllerTypelib = "{9d9a5a2c-576e-4acd-9c75-aabff74b205d}" ?> 33 <?define ControllerTypelib = "{9d9a5a2c-576e-4acd-9c75-aabff74b205d}" ?>
32 34
33 <!-- 35 <!--
34 The long hex value below is a security descriptor that allows SYSTEM, 36 The long hex value below is a security descriptor that allows SYSTEM,
35 built-in administrators and interactive users to call methods of a COM 37 built-in administrators and interactive users to call methods of a COM
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 </Directory> 131 </Directory>
130 132
131 <DirectoryRef Id="binaries"> 133 <DirectoryRef Id="binaries">
132 <Component Id="sas" Guid="*"> 134 <Component Id="sas" Guid="*">
133 <File Id="sas.dll" 135 <File Id="sas.dll"
134 DiskId="1" 136 DiskId="1"
135 Name="sas.dll" 137 Name="sas.dll"
136 Vital="yes"/> 138 Vital="yes"/>
137 </Component> 139 </Component>
138 140
141 <Component Id="remoting_core" Guid="*">
142 <File Id="$(var.CoreBinary)"
143 DiskId="1"
144 KeyPath="yes"
145 Name="$(var.CoreBinary)"
146 Vital="yes"/>
147
148 <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExten sion"
149 Name="$(var.EventSourceName)"
150 Log="Application"
151 CategoryCount="1"
152 CategoryMessageFile="[#$(var.CoreBinary)]"
153 EventMessageFile="[#$(var.CoreBinary)]"
154 SupportsErrors="yes"
155 SupportsInformationals="yes"/>
156 </Component>
157
139 <?if $(var.RemotingMultiProcess) != 0 ?> 158 <?if $(var.RemotingMultiProcess) != 0 ?>
140 <Component Id="remoting_desktop" Guid="*"> 159 <Component Id="remoting_desktop" Guid="*">
141 <File Id="remoting_desktop.exe" 160 <File Id="remoting_desktop.exe"
142 DiskId="1" 161 DiskId="1"
143 KeyPath="yes" 162 KeyPath="yes"
144 Name="remoting_desktop.exe" 163 Name="remoting_desktop.exe"
145 Vital="yes"/> 164 Vital="yes"/>
146 </Component> 165 </Component>
147 <?endif?> 166 <?endif?>
148 167
(...skipping 21 matching lines...) Expand all
170 Remove="uninstall" 189 Remove="uninstall"
171 Name="$(var.ServiceName)" 190 Name="$(var.ServiceName)"
172 Wait="yes" /> 191 Wait="yes" />
173 </Component> 192 </Component>
174 193
175 <Component Id="remoting_host" Guid="*"> 194 <Component Id="remoting_host" Guid="*">
176 <File Id="remoting_host.exe" 195 <File Id="remoting_host.exe"
177 DiskId="1" 196 DiskId="1"
178 Name="remoting_host.exe" 197 Name="remoting_host.exe"
179 Vital="yes"/> 198 Vital="yes"/>
180 <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExten sion"
181 Name="$(var.EventSourceName)"
182 Log="Application"
183 CategoryCount="1"
184 CategoryMessageFile="[#remoting_host.exe]"
185 EventMessageFile="[#remoting_host.exe]"
186 SupportsErrors="yes"
187 SupportsInformationals="yes"/>
188
189 <fire:FirewallException xmlns:fire="http://schemas.microsoft.com/wix/Fir ewallExtension" 199 <fire:FirewallException xmlns:fire="http://schemas.microsoft.com/wix/Fir ewallExtension"
190 Id="me2me_firewall_exception" 200 Id="me2me_firewall_exception"
191 IgnoreFailure="yes" 201 IgnoreFailure="yes"
192 Name="$(var.FirewallName)" 202 Name="$(var.FirewallName)"
193 Profile="all" 203 Profile="all"
194 Program="[#remoting_host.exe]" 204 Program="[#remoting_host.exe]"
195 Scope="any" /> 205 Scope="any" />
196 </Component> 206 </Component>
197 207
198 <?if $(var.OfficialBuild) != 0 ?> 208 <?if $(var.OfficialBuild) != 0 ?>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 <RegistryKey Key="$(var.ControllerClsid)" Action="create"> 276 <RegistryKey Key="$(var.ControllerClsid)" Action="create">
267 <RegistryValue Type="string" 277 <RegistryValue Type="string"
268 Value="$(var.ControllerClass)"/> 278 Value="$(var.ControllerClass)"/>
269 279
270 <RegistryValue Type="string" 280 <RegistryValue Type="string"
271 Name="AppID" 281 Name="AppID"
272 Value="$(var.ControllerAppid)"/> 282 Value="$(var.ControllerAppid)"/>
273 283
274 <RegistryValue Type="string" 284 <RegistryValue Type="string"
275 Name="LocalizedString" 285 Name="LocalizedString"
276 Value="@[#$(var.ControllerBinary)],-100"/> 286 Value="@[binaries]$(var.CoreBinary),-103"/>
277 287
278 <RegistryKey Key="LocalServer32" Action="create"> 288 <RegistryKey Key="LocalServer32" Action="create">
279 <RegistryValue Type="string" 289 <RegistryValue Type="string"
280 Value="[#$(var.ControllerBinary)]"/> 290 Value="[#$(var.ControllerBinary)]"/>
281 </RegistryKey> 291 </RegistryKey>
282 292
283 <RegistryKey Key="ProgID" Action="create"> 293 <RegistryKey Key="ProgID" Action="create">
284 <RegistryValue Type="string" 294 <RegistryValue Type="string"
285 Value="$(var.ControllerProgid).$(var.Version)"/> 295 Value="$(var.ControllerProgid).$(var.Version)"/>
286 </RegistryKey> 296 </RegistryKey>
287 297
288 <RegistryKey Key="TypeLib" Action="create"> 298 <RegistryKey Key="TypeLib" Action="create">
289 <RegistryValue Type="string" 299 <RegistryValue Type="string"
290 Value="$(var.ControllerTypelib)"/> 300 Value="$(var.ControllerTypelib)"/>
291 </RegistryKey> 301 </RegistryKey>
292 302
293 <RegistryKey Key="VersionIndependentProgID" Action="create"> 303 <RegistryKey Key="VersionIndependentProgID" Action="create">
294 <RegistryValue Type="string" 304 <RegistryValue Type="string"
295 Value="$(var.ControllerProgid)"/> 305 Value="$(var.ControllerProgid)"/>
296 </RegistryKey> 306 </RegistryKey>
297 307
298 <RegistryKey Key="Elevation" Action="create"> 308 <RegistryKey Key="Elevation" Action="create">
299 <RegistryValue Type="integer" 309 <RegistryValue Type="integer"
300 Name="Enabled" 310 Name="Enabled"
301 Value="1"/> 311 Value="1"/>
302 <RegistryValue Type="string" 312 <RegistryValue Type="string"
303 Name="IconReference" 313 Name="IconReference"
304 Value="@[#$(var.ControllerBinary)],-101"/> 314 Value="@[binaries]$(var.CoreBinary),-104"/>
305 </RegistryKey> 315 </RegistryKey>
306 </RegistryKey> 316 </RegistryKey>
307 </RegistryKey> 317 </RegistryKey>
308 318
309 <RegistryKey Key="Interface"> 319 <RegistryKey Key="Interface">
310 <RegistryKey Key="{655bd819-c08c-4b04-80c2-f160739ff6ef}" 320 <RegistryKey Key="{655bd819-c08c-4b04-80c2-f160739ff6ef}"
311 Action="create"> 321 Action="create">
312 <RegistryKey Key="ProxyStubClsid32" Action="create"> 322 <RegistryKey Key="ProxyStubClsid32" Action="create">
313 <RegistryValue Type="string" 323 <RegistryValue Type="string"
314 Value="{00020424-0000-0000-C000-000000000046}"/> 324 Value="{00020424-0000-0000-C000-000000000046}"/>
(...skipping 18 matching lines...) Expand all
333 </RegistryKey> 343 </RegistryKey>
334 </RegistryKey> 344 </RegistryKey>
335 </RegistryKey> 345 </RegistryKey>
336 346
337 <RegistryKey Key="Typelib"> 347 <RegistryKey Key="Typelib">
338 <RegistryKey Key="$(var.ControllerTypelib)" Action="create"> 348 <RegistryKey Key="$(var.ControllerTypelib)" Action="create">
339 <RegistryKey Key="1.1" Action="create"> 349 <RegistryKey Key="1.1" Action="create">
340 <RegistryKey Key="0" Action="create"> 350 <RegistryKey Key="0" Action="create">
341 <RegistryKey Key="win32" Action="create"> 351 <RegistryKey Key="win32" Action="create">
342 <RegistryValue Type="string" 352 <RegistryValue Type="string"
343 Value="[#$(var.ControllerBinary)]"/> 353 Value="@[binaries]$(var.CoreBinary)"/>
344 </RegistryKey> 354 </RegistryKey>
345 </RegistryKey> 355 </RegistryKey>
346 356
347 <RegistryKey Key="FLAGS" Action="create"> 357 <RegistryKey Key="FLAGS" Action="create">
348 <RegistryValue Type="string" 358 <RegistryValue Type="string"
349 Value="0"/> 359 Value="0"/>
350 </RegistryKey> 360 </RegistryKey>
351 361
352 <RegistryKey Key="HELPDIR" Action="create"> 362 <RegistryKey Key="HELPDIR" Action="create">
353 <RegistryValue Type="string" 363 <RegistryValue Type="string"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 Execute="deferred" 440 Execute="deferred"
431 Script="jscript"> 441 Script="jscript">
432 <![CDATA[ 442 <![CDATA[
433 var controller = new ActiveXObject("$(var.ControllerProgid)"); 443 var controller = new ActiveXObject("$(var.ControllerProgid)");
434 controller.StartDaemon(); 444 controller.StartDaemon();
435 ]]> 445 ]]>
436 </CustomAction> 446 </CustomAction>
437 447
438 <CustomAction Id="set_service_display_name" 448 <CustomAction Id="set_service_display_name"
439 Property="chromoting_service_display_name" 449 Property="chromoting_service_display_name"
440 Value="@[binaries]remoting_daemon.exe,-101" /> 450 Value="@[binaries]$(var.CoreBinary),-101" />
441 <CustomAction Id="set_service_description" 451 <CustomAction Id="set_service_description"
442 Property="chromoting_service_description" 452 Property="chromoting_service_description"
443 Value="@[binaries]remoting_daemon.exe,-102" /> 453 Value="@[binaries]$(var.CoreBinary),-102" />
444 454
445 <!-- XP does not support MUI strings in the service name and description, so 455 <!-- XP does not support MUI strings in the service name and description, so
446 we fall back to plain strings on XP. --> 456 we fall back to plain strings on XP. -->
447 <CustomAction Id="set_service_display_name_xp" 457 <CustomAction Id="set_service_display_name_xp"
448 Property="chromoting_service_display_name" 458 Property="chromoting_service_display_name"
449 Value="$(var.ChromotingServiceName)" /> 459 Value="$(var.ChromotingServiceName)" />
450 <CustomAction Id="set_service_description_xp" 460 <CustomAction Id="set_service_description_xp"
451 Property="chromoting_service_description" 461 Property="chromoting_service_description"
452 Value="$(var.ChromotingServiceDescription)" /> 462 Value="$(var.ChromotingServiceDescription)" />
453 463
454 <UIRef Id="WixUI_ErrorProgressText" /> 464 <UIRef Id="WixUI_ErrorProgressText" />
455 465
456 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> 466 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
457 <ComponentRef Id="delete_debug_log"/> 467 <ComponentRef Id="delete_debug_log"/>
458 <ComponentRef Id="delete_usagestats"/> 468 <ComponentRef Id="delete_usagestats"/>
459 <?if $(var.OfficialBuild) != 0 ?> 469 <?if $(var.OfficialBuild) != 0 ?>
460 <ComponentRef Id="omaha_registration"/> 470 <ComponentRef Id="omaha_registration"/>
461 <?endif?> 471 <?endif?>
462 <ComponentRef Id="remoting_controller"/> 472 <ComponentRef Id="remoting_controller"/>
473 <ComponentRef Id="remoting_core"/>
463 <ComponentRef Id="remoting_daemon"/> 474 <ComponentRef Id="remoting_daemon"/>
464 <?if $(var.RemotingMultiProcess) != 0 ?> 475 <?if $(var.RemotingMultiProcess) != 0 ?>
465 <ComponentRef Id="remoting_desktop"/> 476 <ComponentRef Id="remoting_desktop"/>
466 <?endif?> 477 <?endif?>
467 <ComponentRef Id="remoting_host"/> 478 <ComponentRef Id="remoting_host"/>
468 <ComponentRef Id="sas"/> 479 <ComponentRef Id="sas"/>
469 <ComponentRef Id="sawbuck_provider"/> 480 <ComponentRef Id="sawbuck_provider"/>
470 </Feature> 481 </Feature>
471 482
472 <!-- Set the icon shown in Add/Remove Programs. --> 483 <!-- Set the icon shown in Add/Remove Programs. -->
(...skipping 19 matching lines...) Expand all
492 <Custom Action="set_service_description" Before="InstallInitialize"> 503 <Custom Action="set_service_description" Before="InstallInitialize">
493 <![CDATA[VersionNT >= 600]]> 504 <![CDATA[VersionNT >= 600]]>
494 </Custom> 505 </Custom>
495 506
496 <!-- Schedule RemoveExistingProducts before installing any files. 507 <!-- Schedule RemoveExistingProducts before installing any files.
497 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> 508 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
498 <RemoveExistingProducts After="InstallInitialize" /> 509 <RemoveExistingProducts After="InstallInitialize" />
499 </InstallExecuteSequence> 510 </InstallExecuteSequence>
500 </Product> 511 </Product>
501 </Wix> 512 </Wix>
OLDNEW
« no previous file with comments | « remoting/host/host_ui_resource.h ('k') | remoting/host/installer/win/parameters.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698