diff options
| author | dcaiafa@chromium.org <dcaiafa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 05:32:11 +0000 |
|---|---|---|
| committer | dcaiafa@chromium.org <dcaiafa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 05:32:11 +0000 |
| commit | 91464ea3fbe81a300542a9039864f874f260cb10 (patch) | |
| tree | 722fa2b9d631f1eb84c658c12bb717291cf60c40 /remoting/host | |
| parent | 0dc0e99d46c708369bf841d00bcd922c62b12ff2 (diff) | |
| download | chromium_src-91464ea3fbe81a300542a9039864f874f260cb10.zip chromium_src-91464ea3fbe81a300542a9039864f874f260cb10.tar.gz chromium_src-91464ea3fbe81a300542a9039864f874f260cb10.tar.bz2 | |
Enable x64 Chromoting host and installer
N.B. I had to move the sawbuck_provider in the .wxs out of the
installation directory. Even though it only contains registry changes,
candle will complain if it is not inside a directory, but the
application directory is platform specific, whereas sawbuck_provider is
always 32-bit.
BUG=394467
Review URL: https://codereview.chromium.org/398173002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/installer/win/chromoting.wxs | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/remoting/host/installer/win/chromoting.wxs b/remoting/host/installer/win/chromoting.wxs index 2dfb8cc..9324e48 100644 --- a/remoting/host/installer/win/chromoting.wxs +++ b/remoting/host/installer/win/chromoting.wxs @@ -18,6 +18,12 @@ <?define Manufacturer = "The Chromium Authors" ?> <?endif?> + <?if $(sys.BUILDARCH) = "x64" ?> + <?define ProgramFilesFolderForPlatform = "ProgramFiles64Folder" ?> + <?else?> + <?define ProgramFilesFolderForPlatform = "ProgramFilesFolder" ?> + <?endif?> + <?if $(var.OfficialBuild) != 0 ?> <?define ChromotingKeyPath = "Google\Chrome Remote Desktop" ?> <?else?> @@ -134,7 +140,7 @@ <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/> <Directory Id="TARGETDIR" Name="SourceDir"> - <Directory Id="ProgramFilesFolder"> + <Directory Id="$(var.ProgramFilesFolderForPlatform)"> <?if $(var.OfficialBuild) != 0 ?> <Directory Id="program_files_google" Name="Google"> <Directory Id="chromoting" Name="Chrome Remote Desktop"> @@ -567,8 +573,24 @@ <CreateFolder/> </Component> - <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. --> - <Component Id="sawbuck_provider" Guid="*"> + <!-- Delete the usagestats flag to reset the crash dump reporting settings + for existing users. --> + <Component Id="delete_usagestats" + Guid="5c73f2b9-b865-426f-81cc-90a27ebb54aa" + KeyPath="yes"> + <Condition>BROKENUSAGESTATSVERSION</Condition> + <RemoveRegistryValue + Id="usagestats" + Key="SOFTWARE\Google\Update\ClientStateMedium\$(var.OmahaAppid)" + Name="usagestats" + Root="HKLM" /> + </Component> + + </DirectoryRef> + + <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. --> + <DirectoryRef Id="TARGETDIR"> + <Component Id="sawbuck_provider" Guid="*" Win64="no"> <RegistryKey Root="HKLM" Key="SOFTWARE\Google\Sawbuck\Providers"> <RegistryKey Key="{2db51ca1-4fd8-4b88-b5a2-fb8606b66b02}" @@ -587,20 +609,6 @@ </RegistryKey> </RegistryKey> </Component> - - <!-- Delete the usagestats flag to reset the crash dump reporting settings - for existing users. --> - <Component Id="delete_usagestats" - Guid="5c73f2b9-b865-426f-81cc-90a27ebb54aa" - KeyPath="yes"> - <Condition>BROKENUSAGESTATSVERSION</Condition> - <RemoveRegistryValue - Id="usagestats" - Key="SOFTWARE\Google\Update\ClientStateMedium\$(var.OmahaAppid)" - Name="usagestats" - Root="HKLM" /> - </Component> - </DirectoryRef> <DirectoryRef Id="config_files"> |