Branch: Tag:

2009-02-17

2009-02-17 15:10:08 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Some more rewrites...

Rev: server/etc/RoxenUI.wxs:1.69

1202:    <DirectorySearch Id="MysqldBin4" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="Mysql41Location1" Root="HKLM" +  Key="SOFTWARE\MySQL AB\MySQL Server 4.1" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin41" Path="bin">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>
1211:    <DirectorySearch Id="MysqldBin3" 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">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>
1220:    <DirectorySearch Id="MysqldBin2" 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">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>
1229:    <DirectorySearch Id="MysqldBin1" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> +  </RegistrySearch> +  <RegistrySearch Id="MysqlLocation1" Root="HKLM" +  Key="SOFTWARE\MySQL AB\[MYSQLNAME]" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin11" Path="bin">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>
1240:    <DirectorySearch Id="MysqlBin5" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> +  </DirectorySearch> +  </DirectorySearch> +  <DirectorySearch Id="MysqlLocation51" Path="[ProgramFilesFolder]\MySQL" Depth="2"> +  <DirectorySearch Id="MysqlBase51">    <DirectorySearch Id="MysqlBin51" Path="bin">    <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>
1283:    </Property>    <Property Id="MYSQLBASE">    <RegistrySearchRef Id="Mysql41Location" /> +  <RegistrySearchRef Id="Mysql41Location1" />    <RegistrySearchRef Id="Mysql50Location" /> -  +  <RegistrySearchRef Id="Mysql50Location1" />    <RegistrySearchRef Id="Mysql51Location" /> -  +  <RegistrySearchRef Id="Mysql51Location1" />    <RegistrySearchRef Id="MysqlLocation" /> -  +  <RegistrySearchRef Id="MysqlLocation1" />    </Property>    <Property Id="FALLBACKMYSQLBASE">    <DirectorySearchRef Id="MysqlBase5" Parent="MysqlLocation5"/> -  +  <DirectorySearchRef Id="MysqlBase51" Parent="MysqlLocation51"/>    </Property>    <Property Id="MYSQLDEBUG1">    <RegistrySearchRef Id="MysqlLocation" />    </Property> -  +  <Property Id="MYSQLDEBUG1"> +  <RegistrySearchRef Id="MysqlLocation1" /> +  </Property>    <Property Id="MYSQLDEBUG2">    <RegistrySearchRef Id="Mysql51Location" />    </Property> -  +  <Property Id="MYSQLDEBUG21"> +  <RegistrySearchRef Id="Mysql51Location1" /> +  </Property>    <Property Id="MYSQLDEBUG3">    <RegistrySearchRef Id="Mysql50Location" />    </Property> -  +  <Property Id="MYSQLDEBUG31"> +  <RegistrySearchRef Id="Mysql50Location1" /> +  </Property>    <Property Id="MYSQLDEBUG4">    <RegistrySearchRef Id="Mysql41Location" />    </Property> -  +  <Property Id="MYSQLDEBUG41"> +  <RegistrySearchRef Id="Mysql41Location1" /> +  </Property>    <Property Id="MYSQLDEBUG5">    <DirectorySearchRef Id="MysqlBase5" Parent="MysqlLocation5"/>    </Property> -  +  <Property Id="MYSQLDEBUG51"> +  <DirectorySearchRef Id="MysqlBase51" Parent="MysqlLocation51"/> +  </Property>    <AdminExecuteSequence>    <Custom Action="DONT_INSTALL_SERVICE" Before="DIRCA_TARGETDIR">NOT VersionNT</Custom>    <Custom Action="DIRCA_TARGETDIR" Before="CostInitialize"><![CDATA[TARGETDIR=""]]></Custom>