bzr commit into wex-installer-1.0 branch (mike.lischke:460)

[Mike Lischke]

#At file:///D:/Work/MySQL/installer/ based on revid:mike.lischke@stripped

  460 Mike Lischke	2011-05-10
      - Checked all XXX items to see what is still to be done.
      - InstallerConfiguration: Moved all default settings to the constructor.
      - Utilities: improved CompareAsNumbers.
      - ConfigOverview: reset item that failed a previous configuration run when re-running the configuration.

    modified:
      StandardPlugins/Server/ConfigurationController.cs
      StandardPlugins/Server/MysqlSCM.cs
      WexInstaller.Core/InstallerConfiguration.cs
      WexInstaller.Core/Utilities.cs
      WexInstaller/Controls/ListViewWex.cs
      WexInstaller/InstallWizard/AllConfigOverview.cs
=== modified file 'StandardPlugins/Server/ConfigurationController.cs'
=== modified file 'StandardPlugins/Server/ConfigurationController.cs'
--- a/StandardPlugins/Server/ConfigurationController.cs	2011-04-09 02:14:47 +0000
+++ b/StandardPlugins/Server/ConfigurationController.cs	2011-05-10 10:02:42 +0000
@@ -106,7 +106,8 @@
         {
           Logger.LogInformation(String.Format("Product configuration controller found {0} installed.", Owner.Name));
 
-          // XXX: unreliable since both 32 bit and 64 bit servers use the same keys (for the same version).
+          // Unreliable since both 32 bit and 64 bit servers use the same keys (for the same version).
+          // Though, usually one can only install one of both server architectures.
           baseDirectory = Owner.GetInstalledProductRegistryKey("Location");
           dataDirectory = Owner.GetInstalledProductRegistryKey("DataLocation");
           if (!afterInstallation)

=== modified file 'StandardPlugins/Server/MysqlSCM.cs'
--- a/StandardPlugins/Server/MysqlSCM.cs	2011-05-03 14:12:50 +0000
+++ b/StandardPlugins/Server/MysqlSCM.cs	2011-05-10 10:02:42 +0000
@@ -9,8 +9,6 @@
 
 using MySQL.Utilities.SysUtils;
 
-// TODO: Use the System.ServiceProcess.ServiceInstaller class instead of P/Invoke for service installation!
-// Here's code to get you started: http://stackoverflow.com/questions/255056/install-a-net-windows-service-without-installutil-exe
 namespace WexInstaller.Core
 {
   public class MySQLServiceControlManager

=== modified file 'WexInstaller.Core/InstallerConfiguration.cs'
--- a/WexInstaller.Core/InstallerConfiguration.cs	2011-05-02 12:40:37 +0000
+++ b/WexInstaller.Core/InstallerConfiguration.cs	2011-05-10 10:02:42 +0000
@@ -158,10 +158,7 @@
       }
       else
       {
-        instance.LicenseAgreement = 1;
-        instance.UpdateCheckFrequency = 7;
-        // XXX: is this a constant GUID or rather dynamically created?
-        instance.ProductCode = "{303BA173-69F6-4DC3-B11B-96B104C45BF9}";
+        // Other default values are set when the instance is constructed.
         instance.UpdateURLs = new List<UpdateURL>();
       }
 
@@ -174,7 +171,6 @@
       }
 
       Logger.LogInformation("Configuration sanity checks and default values.");
-      instance.UpdateTimeoutMilliseconds = 10000;
 
       // Product cache and installation root defaults and sanity checks.
       if (string.IsNullOrEmpty(instance.ProductCachePath))
@@ -211,8 +207,10 @@
     public InstallerConfigurationData()
     {
       LicenseAgreement = 1;
+      UpdateCheckFrequency = 7;
       SendSystemInfo = 1;
       MaxLogCount = 100;
+      UpdateTimeoutMilliseconds = 10000;
     }
   }
 

=== modified file 'WexInstaller.Core/Utilities.cs'
--- a/WexInstaller.Core/Utilities.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller.Core/Utilities.cs	2011-05-10 10:02:42 +0000
@@ -26,11 +26,10 @@
     public static int CompareAsNumbers(string s1, string s2)
     {
       // Make strings comparable as numbers (they must have the same length to work properly).
-      while (s1.Length < s2.Length)
-        s1 = s1.Insert(0, "0");
-      while (s2.Length < s1.Length)
-        s2 = s2.Insert(0, "0");
-
+      if (s1.Length < s2.Length)
+        s1.PadLeft(s2.Length, '0');
+      if (s2.Length < s1.Length)
+        s2.PadLeft(s1.Length, '0');
 
       return s1.CompareTo(s2);
     }

=== modified file 'WexInstaller/Controls/ListViewWex.cs'
--- a/WexInstaller/Controls/ListViewWex.cs	2011-05-02 10:03:49 +0000
+++ b/WexInstaller/Controls/ListViewWex.cs	2011-05-10 10:02:42 +0000
@@ -83,7 +83,7 @@
         case WM.PAINT:
           if (View == View.Details)
           {
-            // XXX: Postion the progress bar on *each* paint cycle? There are better options.
+            // TODO: Postion the progress bar on *each* paint cycle? There are better options.
             if (ProgressBar != null)
             {
               // If the control has a progress bar defined, update it's location

=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.cs'
--- a/WexInstaller/InstallWizard/AllConfigOverview.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/InstallWizard/AllConfigOverview.cs	2011-05-10 10:02:42 +0000
@@ -126,7 +126,7 @@
           lastError.Text = String.Format("Last Error: {0}", e.Details);
           ProductManager.ConfigurationErrors.Add(e.Details);
           SetLineColor(configuringItem, Color.Red);
-          configuringItem.SubItems[3].Text = ListViewWex.LinkMarker + Resources.TryAgainLink + ListViewWex.LinkMarker;                    
+          configuringItem.SubItems[3].Text = ListViewWex.LinkMarker + Resources.TryAgainLink + ListViewWex.LinkMarker;
         }
         else if (e.Type == ConfigurationEventType.Finished)
         {
@@ -182,12 +182,15 @@
         {
           // Reset the current item.
           configuringItem.StateImageIndex = -1;
+
           SetLineColor(configuringItem, Color.LightGray);
           (ParentControl as InstallWizardControl).RemoveConfigPages("Config");
         }
 
         configuringItem = e.Item;
         configuringItem.StateImageIndex = 0;
+        configuringItem.SubItems[2].Text = "";
+        configuringItem.SubItems[3].Text = "";
         SetLineColor(configuringItem, Color.Black);
         (configuringItem.Tag as Product).Controller.PreAction();
         (ParentControl as InstallWizardControl).AddConfigPages(configuringItem.Tag as Product);


Attachment: [text/bzr-bundle] bzr/[e-mail]