Roxen.git/ server/ etc/ RoxenUI.wxs

Branch: Tag:

2014-09-10

2014-09-10 13:59:45 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Installer: The WIN32 installer know knows about MariaDB.

The installer now searches for MariaDB versions 5.5, 10.0 and 10.1.

Also adds searching for MySQL versions 5.5, 5.6 and 5.7.

1338:    </DirectorySearch>    </Property>    <Property Id="MYSQLDEXE"> +  <RegistrySearch Id="MariaDB101Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="INSTALLDIR" Type="raw"> +  <DirectorySearch Id="MysqldBin1" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="MariaDB100Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="INSTALLDIR" Type="raw"> +  <DirectorySearch Id="MysqldBin2" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <!-- FIXME: Is the following correct? --> +  <RegistrySearch Id="MariaDB55Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="INSTALLDIR" Type="raw"> +  <DirectorySearch Id="MysqldBin3" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <!-- FIXME: Is the following correct? --> +  <RegistrySearch Id="Mysql57Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.7" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqldBin4" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <!-- FIXME: Is the following correct? --> +  <RegistrySearch Id="Mysql56Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.6" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqldBin5" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <!-- FIXME: Is the following correct? --> +  <RegistrySearch Id="Mysql55Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.5" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqldBin6" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </RegistrySearch>    <RegistrySearch Id="Mysql51Location" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw"> -  <DirectorySearch Id="MysqldBin2" Path="bin"> +  <DirectorySearch Id="MysqldBin7" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mysql51Location1" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw"> -  <DirectorySearch Id="MysqldBin21" Path="bin"> +  <DirectorySearch Id="MysqldBin8" Path="bin">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mysql50Location" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw"> -  <DirectorySearch Id="MysqldBin3" Path="bin"> +  <DirectorySearch Id="MysqldBin9" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mysql50Location1" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw"> -  <DirectorySearch Id="MysqldBin31" Path="bin"> +  <DirectorySearch Id="MysqldBin10" Path="bin">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>    </RegistrySearch>
1380:    </DirectorySearch>    </Property>    <Property Id="MYISAMCHKEXE"> +  <RegistrySearch Id="Mariadb101Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="Location" Type="raw"> +  <DirectorySearch Id="MyisamBin1" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mariadb100Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="Location" Type="raw"> +  <DirectorySearch Id="MyisamBin2" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mariadb55Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="Location" Type="raw"> +  <DirectorySearch Id="MyisamBin3" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Myisam57Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.7" Name="Location" Type="raw"> +  <DirectorySearch Id="MyisamBin4" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Myisam56Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.6" Name="Location" Type="raw"> +  <DirectorySearch Id="MyisamBin5" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Myisam55Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.5" Name="Location" Type="raw"> +  <DirectorySearch Id="MyisamBin6" Path="bin"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </RegistrySearch>    <RegistrySearch Id="Myisam51Location" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw"> -  <DirectorySearch Id="MyisamBin2" Path="bin"> +  <DirectorySearch Id="MyisamBin7" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Myisam50Location" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw"> -  <DirectorySearch Id="MyisamBin3" Path="bin"> +  <DirectorySearch Id="MyisamBin8" Path="bin">    <FileSearch LongName="myisamchk.exe" />    </DirectorySearch>    </RegistrySearch>
1403:    </DirectorySearch>    </Property>    <Property Id="MYSQLADMINEXE"> +  <RegistrySearch Id="Mariadbadmin101Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.1" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqladminBin1" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mariadbadmin100Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 10.0" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqladminBin2" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mariadbadmin55Location" Root="HKLM" +  Key="SOFTWARE\Monty Program AB\MariaDB 5.5" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqladminBin3" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mysqladmin57Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.7" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqladminBin4" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mysqladmin56Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.6" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqladminBin5" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mysqladmin55Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.5" Name="Location" Type="raw"> +  <DirectorySearch Id="MysqladminBin6" Path="bin"> +  <FileSearch LongName="mysqladmin.exe" /> +  </DirectorySearch> +  </RegistrySearch>    <RegistrySearch Id="Mysqladmin51Location" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw"> -  <DirectorySearch Id="MysqladminBin2" Path="bin"> +  <DirectorySearch Id="MysqladminBin7" Path="bin">    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="Mysqladmin50Location" Root="HKLM"    Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw"> -  <DirectorySearch Id="MysqladminBin3" Path="bin"> +  <DirectorySearch Id="MysqladminBin8" Path="bin">    <FileSearch LongName="mysqladmin.exe" />    </DirectorySearch>    </RegistrySearch>
1426:    </DirectorySearch>    </Property>    <Property Id="MYSQLBASE"> +  <RegistrySearchRef Id="Mariadb101Location" /> +  <RegistrySearchRef Id="Mariadb100Location" /> +  <RegistrySearchRef Id="Mariadb55Location" /> +  <RegistrySearchRef Id="Mysql57Location" /> +  <RegistrySearchRef Id="Mysql56Location" /> +  <RegistrySearchRef Id="Mysql55Location" />    <RegistrySearchRef Id="Mysql51Location" />    <RegistrySearchRef Id="Mysql51Location1" />    <RegistrySearchRef Id="Mysql50Location" />