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

[Manuel de la Peña]

Fix lp:629510 by adding a registry key during the installation with the path used. Later use the registry key to know where the location of u1sync is.

[John Lenton (chipaca)]

review: Approve

[Rick McBride (rmcbride)]

I got text conflicts when merging this into trunk + prerequisites:

Text conflict in build.number
Text conflict in src/Version.css

review: Needs Fixing

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'build.number'
--- build.number	2010-08-10 12:18:28 +0000
+++ build.number	2010-10-06 18:34:40 +0000
@@ -1,1 +1,1 @@
-1.0.409.6549
+1.0.606.5623
\ No newline at end of file

=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs	2010-10-06 18:34:40 +0000
+++ install/UbuntuOne7.wxs	2010-10-06 18:34:40 +0000
@@ -42,6 +42,13 @@
 		
 		<Directory Id="TARGETDIR" 
 		           Name="SourceDir">
+            <Component Id="RegistryEntries" Guid="76925500-d14e-11df-bd3b-0800200c9a66">
+                <RegistryKey Root="HKLM"
+                    Key="Software\Canonical\UbuntuOne"
+                    Action="createAndRemoveOnUninstall">
+                    <RegistryValue Type="string" Name="InstallationPath" Value="[U1Installdir]"/>
+                </RegistryKey>
+            </Component>
 		    <Directory Id="ProgramMenuFolder" 
 			           Name="Programs" >
                 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
@@ -934,6 +941,7 @@
 				 Title="Ubuntu One"
 				 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
             <!-- common data -->
+            <ComponentRef Id="RegistryEntries" />
             <ComponentRef Id="ApplicationShortcut" />
             <ComponentRef Id="UbuntuOneGoDaddyCAComponent" />
 			<ComponentRef Id="UbuntuOneGoDaddyClass2CAComponent" />

=== modified file 'install/UbuntuOneXP.wxs'
--- install/UbuntuOneXP.wxs	2010-10-06 18:34:40 +0000
+++ install/UbuntuOneXP.wxs	2010-10-06 18:34:40 +0000
@@ -42,6 +42,13 @@
 		
 		<Directory Id="TARGETDIR" 
 		           Name="SourceDir">
+            <Component Id="RegistryEntries" Guid="76925500-d14e-11df-bd3b-0800200c9a66">
+                <RegistryKey Root="HKLM"
+                    Key="Software\Canonical\UbuntuOne"
+                    Action="createAndRemoveOnUninstall">
+                    <RegistryValue Type="string" Name="InstallationPath" Value="[U1Installdir]"/>
+                </RegistryKey>
+            </Component>
 		    <Directory Id="ProgramMenuFolder" 
 			           Name="Programs">
                 <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
@@ -731,6 +738,7 @@
 				 Title="Ubuntu One"
 				 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
             <!-- common data -->
+            <ComponentRef Id="RegistryEntries" />
             <ComponentRef Id="ApplicationShortcut" />
             <ComponentRef Id="UbuntuOneGoDaddyCAComponent" />
 			<ComponentRef Id="UbuntuOneGoDaddyClass2CAComponent" />

=== modified file 'src/Canonical.Ubuntu.SSO.Tests/KeyringFixture.cs'
--- src/Canonical.Ubuntu.SSO.Tests/KeyringFixture.cs	2010-10-06 18:34:40 +0000
+++ src/Canonical.Ubuntu.SSO.Tests/KeyringFixture.cs	2010-10-06 18:34:40 +0000
@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
+using Canonical.UbuntuOne.Common.Win32;
 using Microsoft.Win32;
 using NUnit.Framework;
 using Rhino.Mocks;

=== modified file 'src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj'
--- src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-06 18:34:40 +0000
+++ src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-06 18:34:40 +0000
@@ -70,14 +70,12 @@
     <Compile Include="ILoginOrRegisterView.cs" />
     <Compile Include="ILoginView.cs" />
     <Compile Include="IOAuth.cs" />
-    <Compile Include="IRegistryKey.cs" />
     <Compile Include="ISSOCredentialsEncoder.cs" />
     <Compile Include="ISSOLoginProcessor.cs" />
     <Compile Include="JsonSSOCredentialsEncoder.cs" />
     <Compile Include="Keyring.cs" />
     <Compile Include="LoginCredentialsEventArgs.cs" />
     <Compile Include="OAuth.cs" />
-    <Compile Include="RegistryKeyWrapper.cs" />
     <Compile Include="Service\Account.cs" />
     <Compile Include="Service\AccountDiff.cs" />
     <Compile Include="Service\AccountFull.cs" />

=== modified file 'src/Canonical.Ubuntu.SSO/Keyring.cs'
--- src/Canonical.Ubuntu.SSO/Keyring.cs	2010-10-06 18:34:40 +0000
+++ src/Canonical.Ubuntu.SSO/Keyring.cs	2010-10-06 18:34:40 +0000
@@ -23,6 +23,7 @@
 using System.Text;
 using Canonical.UbuntuOne.Common.Aop;
 using Canonical.UbuntuOne.Common.Validation;
+using Canonical.UbuntuOne.Common.Win32;
 using log4net;
 using Microsoft.Win32;
 

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-06 18:34:40 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-06 18:34:40 +0000
@@ -25,6 +25,7 @@
 using Canonical.UbuntuOne.Common.Aop;
 using Canonical.UbuntuOne.Common.Utils;
 using log4net;
+using Microsoft.Win32;
 
 namespace Canonical.UbuntuOne.Client.Notification
 {
@@ -52,7 +53,8 @@
         private ISSOCredentialsProvider _ssoProvider;
         private ILog _logger;
         private readonly object _loggerLock = new object();
-
+        private string _u1SyncPath;
+        private readonly object _u1SyncPathLock = new object();
 
         #endregion
 
@@ -151,6 +153,36 @@
             set { _logger = value; }
         }
 
+        private string U1SyncPath
+        {
+            get
+            {
+                if (_u1SyncPath == null)
+                {
+                    lock (_u1SyncPathLock)
+                    {
+                        try
+                        {
+                            using (var softwareEntry = Registry.LocalMachine.OpenSubKey("SOFTWARE"))
+                            using (var canonicalEntry = softwareEntry.OpenSubKey("Canonical"))
+                            using (var ubuntuOneEntry = canonicalEntry.OpenSubKey("UbuntuOne"))
+                            {
+                                _u1SyncPath = (string) ubuntuOneEntry.GetValue("InstallationPath");
+                                _u1SyncPath = Path.Combine(_u1SyncPath, "Client");
+                                _u1SyncPath = Path.Combine(_u1SyncPath, "U1Sync");
+                            }
+                        }
+                        catch(NullReferenceException)
+                        {
+                            // thrown when we did not find the key, that is, not correct installation
+                            Logger.Error("Registry key HKLM/Software/Canonical/UbuntuOne is not present!!!");
+                        }
+                    }
+                }
+                return _u1SyncPath;
+            }
+        }
+
         #endregion
 
         #region Constructors
@@ -247,15 +279,15 @@
                 {
                     StartInfo =
                     {
-                        WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
-                        FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
+                        WorkingDirectory = U1SyncPath,
+                        FileName = Path.Combine(U1SyncPath, "main.exe"),
                         Arguments = String.Format(" --init \"{0}\" --oauth {1}", oneDir, tokens),
                         UseShellExecute = false,
                         RedirectStandardOutput = true,
                         RedirectStandardError = true,
                         CreateNoWindow = true,
                         WindowStyle = ProcessWindowStyle.Hidden
-                        
+
                     }
                 };
                 Logger.InfoFormat("Executing u1sync with args: {0}", init.StartInfo.Arguments);
@@ -264,15 +296,15 @@
                 Logger.InfoFormat("StandarOutput from u1sync is: {0}", init.StandardOutput.ReadToEnd());
                 Logger.ErrorFormat("StandardError from u1sync is: {0}", init.StandardError.ReadToEnd());
                 init.Close();
-                
+
             }
 
             var proc = new Process
             {
                 StartInfo =
                 {
-                    WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
-                    FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
+                    WorkingDirectory = U1SyncPath,
+                    FileName = Path.Combine(U1SyncPath, "main.exe"),
                     Arguments = String.Format("\"{0}\" --oauth {1}", oneDir, tokens),
                     UseShellExecute = false,
                     RedirectStandardOutput = true,

=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-10-06 18:34:40 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-10-06 18:34:40 +0000
@@ -139,6 +139,8 @@
     <Compile Include="Validation\ValidationException.cs" />
     <Compile Include="Validation\ValidationExtensions.cs" />
     <Compile Include="Utils\Webbrowser.cs" />
+    <Compile Include="Win32\IRegistryKey.cs" />
+    <Compile Include="Win32\RegistryKeyWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="DotUpdater, Version=0.2.0.4, Culture=neutral, processorArchitecture=MSIL">

=== added directory 'src/Canonical.UbuntuOne.Common/Win32'
=== renamed file 'src/Canonical.Ubuntu.SSO/IRegistryKey.cs' => 'src/Canonical.UbuntuOne.Common/Win32/IRegistryKey.cs'
--- src/Canonical.Ubuntu.SSO/IRegistryKey.cs	2010-09-08 15:29:50 +0000
+++ src/Canonical.UbuntuOne.Common/Win32/IRegistryKey.cs	2010-10-06 18:34:40 +0000
@@ -21,7 +21,7 @@
 using System;
 using Microsoft.Win32;
 
-namespace Canonical.Ubuntu.SSO
+namespace Canonical.UbuntuOne.Common.Win32
 {
     /// <summary>
     /// Interface that represents a class that allows to perform the access to 

=== renamed file 'src/Canonical.Ubuntu.SSO/RegistryKeyWrapper.cs' => 'src/Canonical.UbuntuOne.Common/Win32/RegistryKeyWrapper.cs'
--- src/Canonical.Ubuntu.SSO/RegistryKeyWrapper.cs	2010-10-06 18:34:40 +0000
+++ src/Canonical.UbuntuOne.Common/Win32/RegistryKeyWrapper.cs	2010-10-06 18:34:40 +0000
@@ -23,7 +23,7 @@
 using log4net;
 using Microsoft.Win32;
 
-namespace Canonical.Ubuntu.SSO
+namespace Canonical.UbuntuOne.Common.Win32
 {
     /// <summary>
     /// Simple wrapper around the registry class that allows the class to be mocked for testing 
@@ -53,7 +53,7 @@
                 {
                     lock (_loggerLock)
                     {
-                        _logger = LogManager.GetLogger(typeof(Keyring));
+                        _logger = LogManager.GetLogger(typeof(RegistryKeyWrapper));
                     }
                 }
                 return _logger;

=== modified file 'src/Version.cs'
--- src/Version.cs	2010-08-10 12:18:28 +0000
+++ src/Version.cs	2010-10-06 18:34:40 +0000
@@ -3,13 +3,13 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:2.0.50727.4952
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: AssemblyVersionAttribute("1.0.409.6549")]
-[assembly: AssemblyFileVersionAttribute("1.0.409.6549")]
+[assembly: AssemblyVersionAttribute("1.0.606.5623")]
+[assembly: AssemblyFileVersionAttribute("1.0.606.5623")]