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

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

Issue 10831037: Avoid potential conflicts leading to pending reboots while upgrading the me2me host: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 AllowSameVersionUpgrades="yes" 83 AllowSameVersionUpgrades="yes"
84 DowngradeErrorMessage="A later version of [ProductName] is already install ed. Setup will now exit." 84 DowngradeErrorMessage="A later version of [ProductName] is already install ed. Setup will now exit."
85 Schedule="afterInstallInitialize" /> 85 Schedule="afterInstallInitialize" />
86 86
87 <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/> 87 <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/>
88 88
89 <Directory Id="TARGETDIR" Name="SourceDir"> 89 <Directory Id="TARGETDIR" Name="SourceDir">
90 <Directory Id="ProgramFilesFolder"> 90 <Directory Id="ProgramFilesFolder">
91 <?ifdef OfficialBuild ?> 91 <?ifdef OfficialBuild ?>
92 <Directory Id="program_files_google" Name="Google"> 92 <Directory Id="program_files_google" Name="Google">
93 <Directory Id="binaries" Name="Chrome Remote Desktop"/> 93 <Directory Id="chromoting" Name="Chrome Remote Desktop">
94 <Directory Id="binaries" Name="$(var.Version)"/>
Jamie 2012/07/26 19:40:59 This is putting each version in a separate sub-dir
alexeypa (please no reviews) 2012/07/26 20:37:27 I've considered this alternative. There problem is
95 </Directory>
94 </Directory> 96 </Directory>
95 <?else?> 97 <?else?>
96 <Directory Id="binaries" Name="Chromoting"/> 98 <Directory Id="chromoting" Name="Chromoting">
99 <Directory Id="binaries" Name="$(var.Version)"/>
100 </Directory>
97 <?endif?> 101 <?endif?>
98 </Directory> 102 </Directory>
99 <Directory Id="CommonAppDataFolder"> 103 <Directory Id="CommonAppDataFolder">
100 <?ifdef OfficialBuild ?> 104 <?ifdef OfficialBuild ?>
101 <Directory Id="common_app_data_google" Name="Google"> 105 <Directory Id="common_app_data_google" Name="Google">
102 <Directory Id="config_files" Name="Chrome Remote Desktop"/> 106 <Directory Id="config_files" Name="Chrome Remote Desktop"/>
103 </Directory> 107 </Directory>
104 <?else?> 108 <?else?>
105 <Directory Id="config_files" Name="Chromoting"/> 109 <Directory Id="config_files" Name="Chromoting"/>
106 <?endif?> 110 <?endif?>
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 </Custom> 410 </Custom>
407 <Custom Action="set_service_display_name" Before="InstallInitialize"> 411 <Custom Action="set_service_display_name" Before="InstallInitialize">
408 <![CDATA[VersionNT >= 600]]> 412 <![CDATA[VersionNT >= 600]]>
409 </Custom> 413 </Custom>
410 <Custom Action="set_service_description" Before="InstallInitialize"> 414 <Custom Action="set_service_description" Before="InstallInitialize">
411 <![CDATA[VersionNT >= 600]]> 415 <![CDATA[VersionNT >= 600]]>
412 </Custom> 416 </Custom>
413 </InstallExecuteSequence> 417 </InstallExecuteSequence>
414 </Product> 418 </Product>
415 </Wix> 419 </Wix>
OLDNEW
« no previous file with comments | « no previous file | remoting/host/plugin/daemon_controller_win.cc » ('j') | remoting/host/plugin/daemon_controller_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698