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

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

Issue 1916973005: Update OS version checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « no previous file | remoting/resources/remoting_strings.grd » ('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" ?>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 Compressed="yes" 87 Compressed="yes"
88 Description="$(var.ChromotingHost) Package" 88 Description="$(var.ChromotingHost) Package"
89 InstallerVersion="200" 89 InstallerVersion="200"
90 Manufacturer="$(var.Manufacturer)" 90 Manufacturer="$(var.Manufacturer)"
91 InstallScope="perMachine"/> 91 InstallScope="perMachine"/>
92 92
93 <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" /> 93 <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" />
94 <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" /> 94 <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
95 95
96 <Condition 96 <Condition
97 Message="$(var.ChromotingHost) is only supported on Windows XP, Windows Se rver 2003, or higher."> 97 Message="$(var.ChromotingHost) is only supported on Windows 7 and above.">
joedow 2016/04/26 22:06:18 The previous string also mentioned the minimum ser
Jamie 2016/04/26 22:36:37 I think I'd rather keep it simple and consistent w
98 <![CDATA[Installed OR (VersionNT >= 501)]]> 98 <![CDATA[Installed OR (VersionNT >= 601)]]>
99 </Condition> 99 </Condition>
100 100
101 <!-- The upgrade rules below could be expressed with MajorUpgrade element. 101 <!-- The upgrade rules below could be expressed with MajorUpgrade element.
102 Unfortunately, there is a bug in WiX decompiler (Dark) corrupting 102 Unfortunately, there is a bug in WiX decompiler (Dark) corrupting
103 InstallExecuteSequence table. The installation compiled from 103 InstallExecuteSequence table. The installation compiled from
104 the disassembled .msi schedules RemoveExistingProducts after 104 the disassembled .msi schedules RemoveExistingProducts after
105 InstallFinalize while the original installation schedules it after 105 InstallFinalize while the original installation schedules it after
106 InstallInitialize. Fortunately, the verbose version of the upgrade 106 InstallInitialize. Fortunately, the verbose version of the upgrade
107 rules below decompiles correctly, so we use it instead. 107 rules below decompiles correctly, so we use it instead.
108 See http://crbug.com/145265 for more details. 108 See http://crbug.com/145265 for more details.
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 ]]> 609 ]]>
610 </CustomAction> 610 </CustomAction>
611 611
612 <CustomAction Id="set_service_display_name" 612 <CustomAction Id="set_service_display_name"
613 Property="chromoting_service_display_name" 613 Property="chromoting_service_display_name"
614 Value="@[binaries]$(var.CoreBinary),-101" /> 614 Value="@[binaries]$(var.CoreBinary),-101" />
615 <CustomAction Id="set_service_description" 615 <CustomAction Id="set_service_description"
616 Property="chromoting_service_description" 616 Property="chromoting_service_description"
617 Value="@[binaries]$(var.CoreBinary),-102" /> 617 Value="@[binaries]$(var.CoreBinary),-102" />
618 618
619 <!-- XP does not support MUI strings in the service name and description, so
620 we fall back to plain strings on XP. -->
621 <CustomAction Id="set_service_display_name_xp"
622 Property="chromoting_service_display_name"
623 Value="$(var.ChromotingServiceName)" />
624 <CustomAction Id="set_service_description_xp"
625 Property="chromoting_service_description"
626 Value="$(var.ChromotingServiceDescription)" />
627
628 <UIRef Id="WixUI_ErrorProgressText" /> 619 <UIRef Id="WixUI_ErrorProgressText" />
629 620
630 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> 621 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
631 <ComponentRef Id="credits"/> 622 <ComponentRef Id="credits"/>
632 <ComponentRef Id="delete_debug_log"/> 623 <ComponentRef Id="delete_debug_log"/>
633 <ComponentRef Id="delete_usagestats"/> 624 <ComponentRef Id="delete_usagestats"/>
634 <?if $(var.OfficialBuild) != 0 ?> 625 <?if $(var.OfficialBuild) != 0 ?>
635 <ComponentRef Id="omaha_registration"/> 626 <ComponentRef Id="omaha_registration"/>
636 <?endif?> 627 <?endif?>
637 <ComponentRef Id="icudtl"/> 628 <ComponentRef Id="icudtl"/>
(...skipping 19 matching lines...) Expand all
657 <Icon Id="chromoting.ico" SourceFile="chromoting.ico"/> 648 <Icon Id="chromoting.ico" SourceFile="chromoting.ico"/>
658 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" /> 649 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" />
659 650
660 <InstallExecuteSequence> 651 <InstallExecuteSequence>
661 <Custom Action="query_auto_start_service" Before="InstallInitialize"/> 652 <Custom Action="query_auto_start_service" Before="InstallInitialize"/>
662 <Custom Action="start_chromoting_service" After="StartServices"> 653 <Custom Action="start_chromoting_service" After="StartServices">
663 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]> 654 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]>
664 </Custom> 655 </Custom>
665 656
666 <!-- Set the service name and description --> 657 <!-- Set the service name and description -->
667 <Custom Action="set_service_display_name_xp" Before="InstallInitialize"> 658 <Custom Action="set_service_display_name" Before="InstallInitialize"/>
668 <![CDATA[VersionNT < 600]]> 659 <Custom Action="set_service_description" Before="InstallInitialize"/>
669 </Custom>
670 <Custom Action="set_service_description_xp" Before="InstallInitialize">
671 <![CDATA[VersionNT < 600]]>
672 </Custom>
673 <Custom Action="set_service_display_name" Before="InstallInitialize">
674 <![CDATA[VersionNT >= 600]]>
675 </Custom>
676 <Custom Action="set_service_description" Before="InstallInitialize">
677 <![CDATA[VersionNT >= 600]]>
678 </Custom>
679 660
680 <!-- Schedule RemoveExistingProducts before installing any files. 661 <!-- Schedule RemoveExistingProducts before installing any files.
681 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> 662 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
682 <RemoveExistingProducts After="InstallInitialize" /> 663 <RemoveExistingProducts After="InstallInitialize" />
683 </InstallExecuteSequence> 664 </InstallExecuteSequence>
684 </Product> 665 </Product>
685 </Wix> 666 </Wix>
OLDNEW
« no previous file with comments | « no previous file | remoting/resources/remoting_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698