diff options
Diffstat (limited to 'win/packaging/extra.wxs.in')
| -rw-r--r-- | win/packaging/extra.wxs.in | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index e886ed87d06..d003cea26d6 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -230,12 +230,22 @@ <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="154" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no"> <Text>{\Font1}Use UTF8 as default server's character set</Text> </Control> - + <Control Type="Text" Id="Text11" Width="67" Height="17" X="8" Y="190" Text="{\Font1}Data directory" /> + <Control Type="PathEdit" Id="TxtDir" Width="175" Height="18" X="80" Y="190" Property="DATADIR"> + </Control> + <Control Id="btnDirBrowse" Type="PushButton" Width="56" Height="17" X="278" Y="190" Text="Browse..."> + <Publish Property="_BrowseProperty" Value="DATADIR" Order="1">1</Publish> + <Publish Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish> + </Control> <!-- Navigation buttons--> <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back"> <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish> </Control> <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next"> + <Publish Event="DoAction" Value="CheckDataDirectory">1</Publish> + <Publish Property="WarningText" Value="Invalid data directory, choose a different one. Error: [DATADIRERROR]"> + DATADIRERROR + </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="MariaDB">NOT SERVICENAME AND NOT WarningText</Publish> @@ -335,7 +345,7 @@ </UI> <Property Id="CRLF" Value="
" /> - <CustomAction Id="CheckDataDirectoryEmpty" BinaryKey="wixca.dll" DllEntry="CheckDataDirectoryEmpty" Execute="immediate" Impersonate="yes"/> + <CustomAction Id="CheckDataDirectory" BinaryKey="wixca.dll" DllEntry="CheckDataDirectory" Execute="immediate" Impersonate="yes"/> <!-- What to do when navigation buttons are clicked --> <UI Id="MyWixUI_Mondo"> <UIRef Id="WixUI_FeatureTree" /> @@ -355,13 +365,6 @@ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="NewOrUpgradeInstanceDlg" Order="999"> NOT Installed AND UpgradableServiceFound </Publish> - <Publish Dialog="CustomizeDlg" Control="Next" Event="DoAction" Value="CheckDataDirectoryEmpty" Order="1"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish> - <Publish Dialog="CustomizeDlg" Property="DATADIRNOTEMPTY" Control="Next" Order="1"><![CDATA[NOT(&DBInstance=3 AND NOT !DBInstance=3)]]></Publish> - <Publish Dialog="CustomizeDlg" Control="Next" Property="WarningText" Order="2" - Value="Selected data directory [DATADIR] is not empty. Either clean it, or choose another location for 'Database Instance' feature."> - DATADIRNOTEMPTY - </Publish> - <Publish Dialog="CustomizeDlg" Control="Next" Event="SpawnDialog" Value="WarningDlg" Order="3">WarningText</Publish> <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="4"> <![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]> </Publish> @@ -634,13 +637,13 @@ Property="FailureProgram" Execute="deferred" /> - <CustomAction Id='ErrorDataDirNotEmpty' - Error='Chosen data directory [DATADIR] is not empty. It must be empty prior to installation.'/> + <CustomAction Id='ErrorDataDir' + Error='Invalid data directory, choose a different one. Error : [DATADIRERROR]'/> <InstallExecuteSequence> - <Custom Action="CheckDataDirectoryEmpty" After="CostFinalize"> + <Custom Action="CheckDataDirectory" After="CostFinalize"> <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]> </Custom> - <Custom Action="ErrorDataDirNotEmpty" After="CheckDataDirectoryEmpty" >DATADIRNOTEMPTY</Custom> + <Custom Action="ErrorDataDir" After="CheckDataDirectory">DATADIRERROR</Custom> <Custom Action="CheckDatabaseProperties" Before="CreateDatabaseCommand">SERVICENAME</Custom> <Custom Action="CreateDatabaseCommand" After="CostFinalize" > <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]> |