Branch: Tag:

2009-02-13

2009-02-13 17:33:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

More DirectorySearch tests...

Rev: server/etc/RoxenUI.wxs:1.56

1184:    <FileSearch LongName="mysql-location.txt" />    </DirectorySearch>    </Property> +  <Property Id="MYSQLDUMMY"> +  <DirectorySearch Id="MysqlLocation64" Path="[ProgramFiles64Folder]\MySQL" Depth="2"> +  <DirectorySearch Id="MysqlBase64"> +  <DirectorySearch Id="MysqlBin64" Path="bin"/> +  </DirectorySearch> +  </DirectorySearch> +  <DirectorySearch Id="MysqlLocation32" Path="[ProgramFilesFolder]\MySQL" Depth="2"> +  <DirectorySearch Id="MysqlBase64"> +  <DirectorySearch Id="MysqlBin64" Path="bin"/> +  </DirectorySearch> +  </DirectorySearch> +  </Property>    <Property Id="MYSQLLOCATION"> -  <RegistrySearch Id="MysqlLocation" Root="HKLM" -  Key="SOFTWARE\MySQL AB" Name="Location" Type="raw" /> +  <RegistrySearch Id="Mysql51Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.1" Name="Location" Type="raw" /> +  <RegistrySearch Id="Mysql50Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 5.0" Name="Location" Type="raw" /> +  <RegistrySearch Id="Mysql41Location" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 4.1" Name="Location" Type="raw" /> +  <DirectorySearchRef Id="MysqlBase64" Parent="MysqlLocation64"/> +  <DirectorySearchRef Id="MysqlBase32" Parent="MysqlLocation32"/>    </Property> -  +  <Property Id="MYSQLDLOCATION"> +  <DirectorySearch Id="MysqldLocation" Path="[MYSQLLOCATION]"> +  <DirectorySearch Id="MysqldBin" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </DirectorySearch> +  <DirectorySearch Id="Mysqld64Location" Path="[ProgramFiles64Folder]\MySQL" Depth="2"> +  <DirectorySearch Id="Mysqld64Base"> +  <DirectorySearch Id="Mysqld64Bin" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </DirectorySearch> +  </DirectorySearch> +  <DirectorySearch Id="Mysqld32Location" Path="[ProgramFilesFolder]\MySQL" Depth="2"> +  <DirectorySearch Id="Mysqld32Base"> +  <DirectorySearch Id="Mysqld32Bin" Path="bin"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </DirectorySearch> +  </DirectorySearch> +  </Property>    <Property Id="MYSQLD32LOCATION"> -  <DirectorySearch Id="Mysqld32Location" Path="[ProgramFiles]\MySQL" Depth="2"> +  <DirectorySearch Id="Mysqld32Location" Path="[ProgramFilesFolder]\MySQL" Depth="2">    <DirectorySearch Id="Mysql32Base">    <DirectorySearch Id="Mysql32Bin" Path="bin">    <FileSearch LongName="mysqld.exe" />
1198:    </DirectorySearch>    </Property>    <Property Id="MYISAMCHK32LOCATION"> -  <DirectorySearch Id="Mysqld32Location2" Path="[ProgramFiles]\MySQL" Depth="2"> +  <DirectorySearch Id="Mysqld32Location2" Path="[ProgramFilesFolder]\MySQL" Depth="2">    <DirectorySearch Id="Mysql32Base2">    <DirectorySearch Id="Mysql32Bin2" Path="bin">    <FileSearch LongName="myisamchk.exe" />