Roxen.git/ server/ etc/ RoxenUI.wxs

2009-02-17

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

• 009b3e45cb89658e47b02b4d321835b5464a4f5b (21 lines) (+20/-1) ^{[ Show | Annotate ]}
  Branch: 5.2

Now knows about MySQL 5.0's UUID.
MySQL 5.0 has an appended "-nt" on the mysqld binary name.

Rev: server/etc/RoxenUI.wxs:1.68

1190:    </Property>    <Property Id="MYSQLNAME">    <RegistrySearch Id="MysqlName" Root="HKLM" +  Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\\{E9CF8701-483A-4344-8119-0002BD0992A8}" +  Name="DisplayName" Type="raw"/><!-- MySQL 5.0 --> +  <RegistrySearch Id="MysqlName" Root="HKLM"    Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F5E3B9E-ABBD-4B35-BB68-626CB9BE98D6}" -  Name="DisplayName" Type="raw"/> +  Name="DisplayName" Type="raw"/><!-- MySQL 5.1 -->    </Property>    <Property Id="MYSQLDEXE">    <RegistrySearch Id="Mysql41Location" Root="HKLM"
1199:    <DirectorySearch Id="MysqldBin4" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> +  <DirectorySearch Id="MysqldBin41" 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">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> -  +  <DirectorySearch Id="MysqldBin31" Path="bin"> +  <FileSearch LongName="mysqld-nt.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">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> -  +  <DirectorySearch Id="MysqldBin21" Path="bin"> +  <FileSearch LongName="mysqld-nt.exe" /> +  </DirectorySearch>    </RegistrySearch>    <RegistrySearch Id="MysqlLocation" Root="HKLM"    Key="SOFTWARE\MySQL AB\[MYSQLNAME]" Name="Location" Type="raw">    <DirectorySearch Id="MysqldBin1" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> -  +  <DirectorySearch Id="MysqldBin11" Path="bin"> +  <FileSearch LongName="mysqld-nt.exe" /> +  </DirectorySearch>    </RegistrySearch>    </Property>    <Property Id="FALLBACKMYSQLDEXE">
1225:    <DirectorySearch Id="MysqlBin5" Path="bin">    <FileSearch LongName="mysqld.exe" />    </DirectorySearch> +  <DirectorySearch Id="MysqlBin51" Path="bin"> +  <FileSearch LongName="mysqld-nt.exe" />    </DirectorySearch>    </DirectorySearch> -  +  </DirectorySearch>    </Property>    <Property Id="MYISAMCHKEXE">    <RegistrySearch Id="Myisam41Location" Root="HKLM"