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

[Mike Lischke]

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

  403 Mike Lischke	2011-04-04
      - Fixed server msi file names in installer.
      - Added an extra check to not access the template member of the config controller, to avoid crashs if it doesn't exist yet.

    modified:
      Setup/IncludeMSIs.wxs
      StandardPlugins/Server/ServerConfigPanel2.cs
=== modified file 'Setup/IncludeMSIs.wxs'
=== modified file 'Setup/IncludeMSIs.wxs'
--- a/Setup/IncludeMSIs.wxs	2011-04-04 12:41:48 +0000
+++ b/Setup/IncludeMSIs.wxs	2011-04-04 15:22:44 +0000
@@ -6,8 +6,8 @@
         <Component Id="Products" Guid="88D9D419-FCCB-4B4B-881E-FAE4D29C81B9" Permanent="yes">
           <!--File Id="server51_x86" Name="mysql-essential-5.1.55-win32.msi" Source="ProductCache\mysql-essential-5.1.56-win32.msi"/ -->
           <!--File Id="server51_x64" Name="mysql-essential-5.1.55-winx64.msi" Source="ProductCache\mysql-essential-5.1.56-win32.msi"/ -->
-          <File Id="server55_x86" Name="mysql-5.5.9-win32.msi" Source="ProductCache\mysql-5.5.11-win32.msi"/>
-          <File Id="server55_x64" Name="mysql-5.5.9-winx64.msi" Source="ProductCache\mysql-5.5.11-winx64.msi"/>
+          <File Id="server55_x86" Name="mysql-5.5.11-win32.msi" Source="ProductCache\mysql-5.5.11-win32.msi"/>
+          <File Id="server55_x64" Name="mysql-5.5.11-winx64.msi" Source="ProductCache\mysql-5.5.11-winx64.msi"/>
           <File Id="connector_cpp_10_x86" Name="mysql-connector-c++-1.1.0-win32.msi" Source="ProductCache\mysql-connector-c++-1.1.0-win32.msi"/>
           <File Id="connector_cpp_10_x64" Name="mysql-connector-c++-1.1.0-winx64.msi" Source="ProductCache\mysql-connector-c++-1.1.0-winx64.msi"/>
           <File Id="connector_c_60_x86" Name="mysql-connector-c-6.0.2-win32.msi" Source="ProductCache\mysql-connector-c-6.0.2-win32.msi"/>
@@ -16,7 +16,7 @@
           <File Id="connector_odbc_51_x64" Name="mysql-connector-odbc-5.1.8-winx64.msi" Source="ProductCache\mysql-connector-odbc-5.1.8-winx64.msi"/>
           <!--<File Id="examples_51" Name="mysql-examples-5.1.0.msi" Source="ProductCache\mysql-examples-5.1.56.msi"/> -->
           <File Id="examples_55" Name="mysql-examples-5.5.11.msi" Source="ProductCache\mysql-examples-5.5.11.msi"/>
-          <File Id="documents_55" Name="mysql-documents=5.5.11.msi" Source="ProductCache\mysql-documents-5.5.11.msi"/>
+          <File Id="documents_55" Name="mysql-documents-5.5.11.msi" Source="ProductCache\mysql-documents-5.5.11.msi"/>
           <!--<File Id="documents_51" Name="mysql-documents-5.1.56..msi" Source="ProductCache\mysql-documents-5.1.56..msi"/>-->
           <File Id="workbench_gpl_52" Name="mysql-workbench-gpl-5.2.33b-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.33b-win32.msi"/>
         </Component>

=== modified file 'StandardPlugins/Server/ServerConfigPanel2.cs'
--- a/StandardPlugins/Server/ServerConfigPanel2.cs	2011-03-30 13:40:12 +0000
+++ b/StandardPlugins/Server/ServerConfigPanel2.cs	2011-04-04 15:22:44 +0000
@@ -199,7 +199,7 @@
     /// </summary>
     private void serviceName_TextChanged(object sender, EventArgs e)
     {
-      if (Controller.Template.Reconfiguring || !createService.Checked)
+      if ((Controller.Template != null && Controller.Template.Reconfiguring) || !createService.Checked)
         return;
 
       string name = serviceName.Text.Trim();


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