| 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 29 matching lines...) Expand all Loading... |
| 40 $sddl = "O:BAG:BAD:(A;;0x3;;;IU)(A;;0x3;;;SY)(A;;0x3;;;BA)" | 40 $sddl = "O:BAG:BAD:(A;;0x3;;;IU)(A;;0x3;;;SY)(A;;0x3;;;BA)" |
| 41 $i = ([wmiclass]"Win32_SecurityDescriptorHelper").SDDLToBinarySD($sddl).Bi
narySD | 41 $i = ([wmiclass]"Win32_SecurityDescriptorHelper").SDDLToBinarySD($sddl).Bi
narySD |
| 42 -join ($i | foreach {$_.ToString("X2")}) | 42 -join ($i | foreach {$_.ToString("X2")}) |
| 43 --> | 43 --> |
| 44 <?define ControllerSd = "010004805C0000006C00000000000000140000000200480003000
00000001400030000000101000000000005040000000000140003000000010100000000000512000
00000001800030000000102000000000005200000002002000001020000000000052000000020020
00001020000000000052000000020020000" ?> | 44 <?define ControllerSd = "010004805C0000006C00000000000000140000000200480003000
00000001400030000000101000000000005040000000000140003000000010100000000000512000
00000001800030000000102000000000005200000002002000001020000000000052000000020020
00001020000000000052000000020020000" ?> |
| 45 | 45 |
| 46 <?ifndef ControllerClsid ?> | 46 <?ifndef ControllerClsid ?> |
| 47 <?error ControllerClsid must be defined ?> | 47 <?error ControllerClsid must be defined ?> |
| 48 <?endif?> | 48 <?endif?> |
| 49 | 49 |
| 50 <?ifndef FileSource ?> | |
| 51 <?error FileSource must be defined ?> | |
| 52 <?endif?> | |
| 53 | |
| 54 <?ifndef IconPath ?> | |
| 55 <?error IconPath must be defined ?> | |
| 56 <?endif?> | |
| 57 | |
| 58 <?ifndef SasDllPath ?> | |
| 59 <?error SasDllPath must be defined ?> | |
| 60 <?endif?> | |
| 61 | |
| 62 <?ifndef Version ?> | 50 <?ifndef Version ?> |
| 63 <?error Version must be defined ?> | 51 <?error Version must be defined ?> |
| 64 <?endif?> | 52 <?endif?> |
| 65 | 53 |
| 66 <Product Id="*" | 54 <Product Id="*" |
| 67 Language="1033" | 55 Language="1033" |
| 68 Manufacturer="$(var.Manufacturer)" | 56 Manufacturer="$(var.Manufacturer)" |
| 69 Name="$(var.ChromotingHost)" | 57 Name="$(var.ChromotingHost)" |
| 70 UpgradeCode="$(var.UpgradeCode)" | 58 UpgradeCode="$(var.UpgradeCode)" |
| 71 Version="$(var.Version)"> | 59 Version="$(var.Version)"> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 </Upgrade> | 92 </Upgrade> |
| 105 | 93 |
| 106 <Condition Message="A later version of [ProductName] is already installed. S
etup will now exit."> | 94 <Condition Message="A later version of [ProductName] is already installed. S
etup will now exit."> |
| 107 NOT NEWERVERSIONDETECTED | 95 NOT NEWERVERSIONDETECTED |
| 108 </Condition> | 96 </Condition> |
| 109 | 97 |
| 110 <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/> | 98 <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/> |
| 111 | 99 |
| 112 <Directory Id="TARGETDIR" Name="SourceDir"> | 100 <Directory Id="TARGETDIR" Name="SourceDir"> |
| 113 <Directory Id="ProgramFilesFolder"> | 101 <Directory Id="ProgramFilesFolder"> |
| 114 <?ifdef OfficialBuild ?> | 102 <?if $(var.OfficialBuild) != 0 ?> |
| 115 <Directory Id="program_files_google" Name="Google"> | 103 <Directory Id="program_files_google" Name="Google"> |
| 116 <Directory Id="chromoting" Name="Chrome Remote Desktop"> | 104 <Directory Id="chromoting" Name="Chrome Remote Desktop"> |
| 117 <Directory Id="binaries" Name="$(var.Version)"/> | 105 <Directory Id="binaries" Name="$(var.Version)"/> |
| 118 </Directory> | 106 </Directory> |
| 119 </Directory> | 107 </Directory> |
| 120 <?else?> | 108 <?else?> |
| 121 <Directory Id="chromoting" Name="Chromoting"> | 109 <Directory Id="chromoting" Name="Chromoting"> |
| 122 <Directory Id="binaries" Name="$(var.Version)"/> | 110 <Directory Id="binaries" Name="$(var.Version)"/> |
| 123 </Directory> | 111 </Directory> |
| 124 <?endif?> | 112 <?endif?> |
| 125 </Directory> | 113 </Directory> |
| 126 <Directory Id="CommonAppDataFolder"> | 114 <Directory Id="CommonAppDataFolder"> |
| 127 <?ifdef OfficialBuild ?> | 115 <?if $(var.OfficialBuild) != 0 ?> |
| 128 <Directory Id="common_app_data_google" Name="Google"> | 116 <Directory Id="common_app_data_google" Name="Google"> |
| 129 <Directory Id="config_files" Name="Chrome Remote Desktop"/> | 117 <Directory Id="config_files" Name="Chrome Remote Desktop"/> |
| 130 </Directory> | 118 </Directory> |
| 131 <?else?> | 119 <?else?> |
| 132 <Directory Id="config_files" Name="Chromoting"/> | 120 <Directory Id="config_files" Name="Chromoting"/> |
| 133 <?endif?> | 121 <?endif?> |
| 134 </Directory> | 122 </Directory> |
| 135 </Directory> | 123 </Directory> |
| 136 | 124 |
| 137 <DirectoryRef Id="binaries" FileSource="$(var.FileSource)"> | 125 <DirectoryRef Id="binaries"> |
| 138 <Component Id="sas" Guid="*"> | 126 <Component Id="sas" Guid="*"> |
| 139 <File Id="sas.dll" | 127 <File Id="sas.dll" |
| 140 DiskId="1" | 128 DiskId="1" |
| 141 Name="sas.dll" | 129 Name="sas.dll" |
| 142 Source="$(var.SasDllPath)" | |
| 143 Vital="yes"/> | 130 Vital="yes"/> |
| 144 </Component> | 131 </Component> |
| 145 | 132 |
| 146 <?if $(var.RemotingMultiProcess) != 0 ?> | 133 <?if $(var.RemotingMultiProcess) != 0 ?> |
| 147 <Component Id="remoting_desktop" Guid="*"> | 134 <Component Id="remoting_desktop" Guid="*"> |
| 148 <File Id="remoting_desktop.exe" | 135 <File Id="remoting_desktop.exe" |
| 149 DiskId="1" | 136 DiskId="1" |
| 150 KeyPath="yes" | 137 KeyPath="yes" |
| 151 Name="remoting_desktop.exe" | 138 Name="remoting_desktop.exe" |
| 152 Vital="yes"/> | 139 Vital="yes"/> |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 | 182 |
| 196 <fire:FirewallException xmlns:fire="http://schemas.microsoft.com/wix/Fir
ewallExtension" | 183 <fire:FirewallException xmlns:fire="http://schemas.microsoft.com/wix/Fir
ewallExtension" |
| 197 Id="me2me_firewall_exception" | 184 Id="me2me_firewall_exception" |
| 198 IgnoreFailure="yes" | 185 IgnoreFailure="yes" |
| 199 Name="$(var.FirewallName)" | 186 Name="$(var.FirewallName)" |
| 200 Profile="all" | 187 Profile="all" |
| 201 Program="[#remoting_me2me_host.exe]" | 188 Program="[#remoting_me2me_host.exe]" |
| 202 Scope="any" /> | 189 Scope="any" /> |
| 203 </Component> | 190 </Component> |
| 204 | 191 |
| 205 <?ifdef OfficialBuild ?> | 192 <?if $(var.OfficialBuild) != 0 ?> |
| 206 <Component Id="omaha_registration" Guid="*"> | 193 <Component Id="omaha_registration" Guid="*"> |
| 207 <RegistryKey Id="omaha_client_key" | 194 <RegistryKey Id="omaha_client_key" |
| 208 Root="HKLM" | 195 Root="HKLM" |
| 209 Key="SOFTWARE\Google\Update\Clients\$(var.OmahaAppid)" | 196 Key="SOFTWARE\Google\Update\Clients\$(var.OmahaAppid)" |
| 210 Action="create"> | 197 Action="create"> |
| 211 <RegistryValue Type="string" | 198 <RegistryValue Type="string" |
| 212 Name="pv" | 199 Name="pv" |
| 213 Value="$(var.Version)"/> | 200 Value="$(var.Version)"/> |
| 214 | 201 |
| 215 <RegistryValue Type="string" | 202 <RegistryValue Type="string" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 <CustomAction Id="set_service_display_name_xp" | 396 <CustomAction Id="set_service_display_name_xp" |
| 410 Property="chromoting_service_display_name" | 397 Property="chromoting_service_display_name" |
| 411 Value="$(var.ChromotingServiceName)" /> | 398 Value="$(var.ChromotingServiceName)" /> |
| 412 <CustomAction Id="set_service_description_xp" | 399 <CustomAction Id="set_service_description_xp" |
| 413 Property="chromoting_service_description" | 400 Property="chromoting_service_description" |
| 414 Value="$(var.ChromotingServiceDescription)" /> | 401 Value="$(var.ChromotingServiceDescription)" /> |
| 415 | 402 |
| 416 <UIRef Id="WixUI_ErrorProgressText" /> | 403 <UIRef Id="WixUI_ErrorProgressText" /> |
| 417 | 404 |
| 418 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> | 405 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> |
| 419 <?ifdef OfficialBuild ?> | 406 <?if $(var.OfficialBuild) != 0 ?> |
| 420 <ComponentRef Id="omaha_registration"/> | 407 <ComponentRef Id="omaha_registration"/> |
| 421 <?endif?> | 408 <?endif?> |
| 422 <ComponentRef Id="remoting_controller"/> | 409 <ComponentRef Id="remoting_controller"/> |
| 423 <ComponentRef Id="remoting_daemon"/> | 410 <ComponentRef Id="remoting_daemon"/> |
| 424 <?if $(var.RemotingMultiProcess) != 0 ?> | 411 <?if $(var.RemotingMultiProcess) != 0 ?> |
| 425 <ComponentRef Id="remoting_desktop"/> | 412 <ComponentRef Id="remoting_desktop"/> |
| 426 <?endif?> | 413 <?endif?> |
| 427 <ComponentRef Id="remoting_host"/> | 414 <ComponentRef Id="remoting_host"/> |
| 428 <ComponentRef Id="sas"/> | 415 <ComponentRef Id="sas"/> |
| 429 </Feature> | 416 </Feature> |
| 430 | 417 |
| 431 <!-- Set the icon shown in Add/Remove Programs. --> | 418 <!-- Set the icon shown in Add/Remove Programs. --> |
| 432 <Icon Id="chromoting.ico" SourceFile="$(var.IconPath)"/> | 419 <Icon Id="chromoting.ico" SourceFile="chromoting.ico"/> |
| 433 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" /> | 420 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" /> |
| 434 | 421 |
| 435 <InstallExecuteSequence> | 422 <InstallExecuteSequence> |
| 436 <Custom Action="query_auto_start_service" Before="InstallInitialize"/> | 423 <Custom Action="query_auto_start_service" Before="InstallInitialize"/> |
| 437 <Custom Action="set_auto_start_service" After="StartServices"> | 424 <Custom Action="set_auto_start_service" After="StartServices"> |
| 438 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]> | 425 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]> |
| 439 </Custom> | 426 </Custom> |
| 440 | 427 |
| 441 <!-- Set the serivce name and description --> | 428 <!-- Set the serivce name and description --> |
| 442 <Custom Action="set_service_display_name_xp" Before="InstallInitialize"> | 429 <Custom Action="set_service_display_name_xp" Before="InstallInitialize"> |
| 443 <![CDATA[VersionNT < 600]]> | 430 <![CDATA[VersionNT < 600]]> |
| 444 </Custom> | 431 </Custom> |
| 445 <Custom Action="set_service_description_xp" Before="InstallInitialize"> | 432 <Custom Action="set_service_description_xp" Before="InstallInitialize"> |
| 446 <![CDATA[VersionNT < 600]]> | 433 <![CDATA[VersionNT < 600]]> |
| 447 </Custom> | 434 </Custom> |
| 448 <Custom Action="set_service_display_name" Before="InstallInitialize"> | 435 <Custom Action="set_service_display_name" Before="InstallInitialize"> |
| 449 <![CDATA[VersionNT >= 600]]> | 436 <![CDATA[VersionNT >= 600]]> |
| 450 </Custom> | 437 </Custom> |
| 451 <Custom Action="set_service_description" Before="InstallInitialize"> | 438 <Custom Action="set_service_description" Before="InstallInitialize"> |
| 452 <![CDATA[VersionNT >= 600]]> | 439 <![CDATA[VersionNT >= 600]]> |
| 453 </Custom> | 440 </Custom> |
| 454 | 441 |
| 455 <!-- Schedule RemoveExistingProducts before installing any files. | 442 <!-- Schedule RemoveExistingProducts before installing any files. |
| 456 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> | 443 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> |
| 457 <RemoveExistingProducts After="InstallInitialize" /> | 444 <RemoveExistingProducts After="InstallInitialize" /> |
| 458 </InstallExecuteSequence> | 445 </InstallExecuteSequence> |
| 459 </Product> | 446 </Product> |
| 460 </Wix> | 447 </Wix> |
| OLD | NEW |