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
=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs 2010-10-21 10:58:43 +0000
+++ install/UbuntuOne7.wxs 2010-10-21 10:58:43 +0000
@@ -42,7 +42,7 @@
42 42
43 <Directory Id="TARGETDIR" 43 <Directory Id="TARGETDIR"
44 Name="SourceDir">44 Name="SourceDir">
45 <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66">45 <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66" Win64="no">
46 <RegistryKey Root="HKLM"46 <RegistryKey Root="HKLM"
47 Key="Software\Canonical\UbuntuOne"47 Key="Software\Canonical\UbuntuOne"
48 Action="createAndRemoveOnUninstall">48 Action="createAndRemoveOnUninstall">
@@ -52,7 +52,7 @@
52 <Directory Id="ProgramMenuFolder" 52 <Directory Id="ProgramMenuFolder"
53 Name="Programs" >53 Name="Programs" >
54 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">54 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
55 <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66">55 <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66" Win64="no">
56 <Shortcut Id="ApplicationStartMenuShortcut" 56 <Shortcut Id="ApplicationStartMenuShortcut"
57 Name="Ubuntu One" 57 Name="Ubuntu One"
58 Description="Your personalized cloud storage."58 Description="Your personalized cloud storage."
5959
=== modified file 'install/UbuntuOneXP.wxs'
--- install/UbuntuOneXP.wxs 2010-10-21 10:58:43 +0000
+++ install/UbuntuOneXP.wxs 2010-10-21 10:58:43 +0000
@@ -42,7 +42,7 @@
42 42
43 <Directory Id="TARGETDIR" 43 <Directory Id="TARGETDIR"
44 Name="SourceDir">44 Name="SourceDir">
45 <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66">45 <Component Id="RegistryInstallationPath" Guid="76925500-d14e-11df-bd3b-0800200c9a66" Win64="no">
46 <RegistryKey Root="HKLM"46 <RegistryKey Root="HKLM"
47 Key="Software\Canonical\UbuntuOne"47 Key="Software\Canonical\UbuntuOne"
48 Action="createAndRemoveOnUninstall">48 Action="createAndRemoveOnUninstall">
@@ -52,7 +52,7 @@
52 <Directory Id="ProgramMenuFolder" 52 <Directory Id="ProgramMenuFolder"
53 Name="Programs">53 Name="Programs">
54 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">54 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
55 <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66">55 <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66" Win64="no">
56 <Shortcut Id="ApplicationStartMenuShortcut" 56 <Shortcut Id="ApplicationStartMenuShortcut"
57 Name="Ubuntu One" 57 Name="Ubuntu One"
58 Description="Your personalized cloud storage."58 Description="Your personalized cloud storage."

Subscribers

People subscribed via source and target branches

to all changes: