[Commits] Rev 2925: Address some bugs found by Philip in his tests: in file:///H:/bzr/5.2-windows-packaging/

Vladislav Vaintroub wlad at montyprogram.com
Sun Jan 16 23:00:21 EET 2011


At file:///H:/bzr/5.2-windows-packaging/

------------------------------------------------------------
revno: 2925
revision-id: wlad at montyprogram.com-20110116210019-j03gwihkpd5ppfe2
parent: wlad at montyprogram.com-20110115014139-cw5vf3g5q35k9xhk
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.2-windows-packaging
timestamp: Sun 2011-01-16 22:00:19 +0100
message:
  Address some bugs  found by Philip in his tests:
  - Fix double-space in "database instance properties" dialog
  - Ensure error messages end with dot.
  - Use "Sunken=yes" property for TCP port control element  to make it similar to other edit elements.
  - Add "Only new database can be installed with this feature." to the "Database instance" feature description.
-------------- next part --------------
=== modified file 'win/packaging/ca/CustomAction.cpp'
--- a/win/packaging/ca/CustomAction.cpp	2011-01-13 15:02:36 +0000
+++ b/win/packaging/ca/CustomAction.cpp	2011-01-16 21:00:19 +0000
@@ -434,7 +434,7 @@
   {
     if(ServiceNameLen > 256)
     {
-      ErrorMsg= L"Invalid service name: maximum 256 characters are allowed";
+      ErrorMsg= L"Invalid service name: maximum 256 characters are allowed.";
       goto err;
     }
     for(DWORD i=0; i< ServiceNameLen;i++)
@@ -481,14 +481,14 @@
     }
     if (haveInvalidPort)
     {
-      ErrorMsg = L"Invalid port. Please use number between 1025 and 65535";
+      ErrorMsg = L"Invalid port. Please use number between 1025 and 65535.";
       goto err;
     }
 
     short port = (short)_wtoi(Port);
     if (!IsPortFree(port))
     {
-      ErrorMsg = L"TCP Port is already in use. Choose a different port";
+      ErrorMsg = L"TCP Port is already in use. Choose a different port.";
       goto err;
     }
   }

=== modified file 'win/packaging/extra.wxs.in'
--- a/win/packaging/extra.wxs.in	2011-01-14 15:52:45 +0000
+++ b/win/packaging/extra.wxs.in	2011-01-16 21:00:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Fragment>
-    <Property Id="PortTemplate" Value="####" />
+    <Property Id="PortTemplate" Value="#####" />
 
     <!--
       Installation parameters that can be passed via msiexec command line
@@ -127,7 +127,7 @@
 
         <Control Id="CheckBoxCreateDefaultUser" Type="CheckBox" X="8" Y="154" Width="200" Height="18" Property="DEFAULTUSER"
                  CheckBoxValue="--default-user" TabSkip="no">
-          <Text>{\Font1}Create An  Anonymous Account</Text>
+          <Text>{\Font1}Create An Anonymous Account</Text>
         </Control>
         <Control Id="Text14" Type="Text" X="21" Y="174" Width="268" Height="16" TabSkip="yes">
           <Text>This option will create an anonymous account on this server. </Text>
@@ -141,7 +141,7 @@
           <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
         </Control>
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
-          <Publish Property="WarningText" Value="Password does not match"><![CDATA[PASSWORD <> RootPasswordConfirm]]></Publish>
+          <Publish Property="WarningText" Value="Passwords do not match."><![CDATA[PASSWORD <> RootPasswordConfirm]]></Publish>
           <Publish Event="SpawnDialog" Value="WarningDlg"><![CDATA[WarningText <>""]]></Publish>
           <Publish Property="SERVICENAME" Value="MySQL">NOT SERVICENAME AND NOT WarningText</Publish>
           <Publish Event="NewDialog" Value="ServicePortDlg"><![CDATA[WarningText=""]]></Publish>
@@ -185,7 +185,7 @@
           <Publish Property="SKIPNETWORKING">EnableNetworking</Publish>
         </Control>
         <Control Id="LabelTCPPort" Type="Text" Height="17" Width="75" X="25" Y="142" Text="TCP port:" />
-        <Control Id="Port" Type="MaskedEdit" X="104" Y="140" Width="39" Height="15" Property="PORT" Text="[PortTemplate]">
+        <Control Id="Port" Type="MaskedEdit" X="104" Y="140" Width="28" Height="15" Property="PORT" Sunken="yes" Text="[PortTemplate]">
           <Condition Action="enable" >EnableNetworking</Condition>
           <Condition Action="disable">Not EnableNetworking</Condition>
         </Control>
@@ -269,7 +269,8 @@
     <!-- Extra feature (database instance). This could be split to several subfeatures if desired (e.g firewall exception)-->
     <Feature Id='DBInstance'
          Title='Database instance'
-         Description='Install database instance'
+         Description=
+             'Install database instance. Note that this can only install a new database instance.'
          ConfigurableDirectory='DATADIR'
          AllowAdvertise='no'
          Level='1'>
@@ -337,7 +338,7 @@
           Value="1" Type="string" KeyPath="yes" />
         <!-- shortcut to client-->
         <Shortcut Id="shortcut.mysql.exe"
-          Name="mysql.exe for root user (@CPACK_WIX_PACKAGE_NAME@)"
+          Name="MySQL Client (@CPACK_WIX_PACKAGE_NAME@)"
           Target="[System64Folder]cmd.exe"
           Arguments="/k &quot; &quot;[D.bin]mysql.exe&quot; &quot;--defaults-file=[DATADIR]my.ini&quot; -uroot -p&quot;"
           Directory="ShortcutFolder"



More information about the commits mailing list