Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/add_installer_x64_support into lp:ubuntuone-windows-installer/beta

  1. add_installer_x64_support
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Merged at revision: 117
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_installer_x64_support
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/improve_logging
Diff against target: 43 lines (+4/-4)
2 files modified
install/UbuntuOne7.wxs (+2/-2)
install/UbuntuOneXP.wxs (+2/-2)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_installer_x64_support
Reviewer Review Type Date Requested Status
Ubuntu One hackers Pending
Review via email: mp+39029@code.launchpad.net

Description of the change

Adds support to install the port in x64 machines.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install/UbuntuOne7.wxs'
2--- install/UbuntuOne7.wxs 2010-10-21 10:58:43 +0000
3+++ install/UbuntuOne7.wxs 2010-10-21 10:58:43 +0000
4@@ -42,7 +42,7 @@
5
6 <Directory Id="TARGETDIR"
7 Name="SourceDir">
8- <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66">
9+ <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66" Win64="no">
10 <RegistryKey Root="HKLM"
11 Key="Software\Canonical\UbuntuOne"
12 Action="createAndRemoveOnUninstall">
13@@ -52,7 +52,7 @@
14 <Directory Id="ProgramMenuFolder"
15 Name="Programs" >
16 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
17- <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66">
18+ <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66" Win64="no">
19 <Shortcut Id="ApplicationStartMenuShortcut"
20 Name="Ubuntu One"
21 Description="Your personalized cloud storage."
22
23=== modified file 'install/UbuntuOneXP.wxs'
24--- install/UbuntuOneXP.wxs 2010-10-21 10:58:43 +0000
25+++ install/UbuntuOneXP.wxs 2010-10-21 10:58:43 +0000
26@@ -42,7 +42,7 @@
27
28 <Directory Id="TARGETDIR"
29 Name="SourceDir">
30- <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66">
31+ <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66" Win64="no">
32 <RegistryKey Root="HKLM"
33 Key="Software\Canonical\UbuntuOne"
34 Action="createAndRemoveOnUninstall">
35@@ -52,7 +52,7 @@
36 <Directory Id="ProgramMenuFolder"
37 Name="Programs">
38 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
39- <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66">
40+ <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66" Win64="no">
41 <Shortcut Id="ApplicationStartMenuShortcut"
42 Name="Ubuntu One"
43 Description="Your personalized cloud storage."

Subscribers

People subscribed via source and target branches

to all changes: