Branch: Tag:

2009-02-12

2009-02-12 11:56:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Added some support for creation of mysql-location.txt.

Rev: server/etc/RoxenUI.wxs:1.45

15:    <CustomAction Id="SetRemoveOldService" Property="RemoveOldService"    Value="[TARGETDIR]" Execute="immediate" />    <CustomAction Id="RemoveOldService" BinaryKey="RoxenInstaller" -  VBScriptCall="RemoveOldService" Execute="deferred" /> +  VBScriptCall="RemoveOldService" Execute="deferred" Impersonate="No" />    <CustomAction Id="SetCreateConfigInterface"    Property="CreateConfigInterface"    Value="[SERVERDIR];[SERVER_NAME];[SERVER_PROTOCOL];[SERVER_PORT];[ADM_USER];[ADM_PASS1]"    Execute="immediate" />    <CustomAction Id="CreateConfigInterface" BinaryKey="RoxenInstaller" -  VBScriptCall="CreateConfigInterface" Execute="deferred" /> +  VBScriptCall="CreateConfigInterface" Execute="deferred" Impersonate="No" /> +  <CustomAction Id="SetCreateMysql32Location" Property="CreateMysqlLocation" +  Value="[SERVERDIR];[MYSQLD32LOCATION];[MYISAMCHK32LOCATION]" Execute="immediate" /> +  <CustomAction Id="SetCreateMysql64Location" Property="CreateMysqlLocation" +  Value="[SERVERDIR];[MYSQLD64LOCATION];[MYISAMCHK32LOCATION]" Execute="immediate" /> +  <CustomAction Id="CreateMysqlLocation" BinaryKey="RoxenInstaller" +  VBScriptCall="CreateMysqlLocation" Execute="deferred" Impersonate="No" />    <CustomAction Id="SetCreatePikeLocation" Property="CreatePikeLocation"    Value="[SERVERDIR]" Execute="immediate" />    <CustomAction Id="CreatePikeLocation" BinaryKey="RoxenInstaller" -  VBScriptCall="CreatePikeLocation" Execute="deferred" /> +  VBScriptCall="CreatePikeLocation" Execute="deferred" Impersonate="No" />    <CustomAction Id="StartBrowser" Property="BROWSER"    ExeCommand="[SERVER_PROTOCOL]://localhost:[SERVER_PORT]/"    Execute="deferred" Return="asyncNoWait" />
37:    Value="[TARGETDIR]local/environment.ini"    Execute="immediate" />    <CustomAction Id="CreateEnvironment" BinaryKey="RoxenInstaller" -  VBScriptCall="CreateEnvironment" Execute="deferred" /> +  VBScriptCall="CreateEnvironment" Execute="deferred" Impersonate="No" />    <UI>    <Property Id="ErrorDialog"><![CDATA[ErrorDialog]]></Property>    <Property Id="DefaultUIFont"><![CDATA[VsdDefaultUIFont.524F4245_5254_5341_4C45_534153783400]]></Property>
1167:    <FileSearch LongName="Global_Variables" MinSize="128" />    </DirectorySearch>    </Property> +  <Property Id="MYSQLLOCATION"> +  <RegistrySearch Id="MysqlLocation" Root="HKLM" +  Key="SOFTWARE\MySQL AB" Type="raw"> +  <DirectorySearch Id="MysqlVersionLocation"> +  <FileSearch LongName="Location" MinVersion="4.1"/> +  </DirectorySearch> +  </RegistrySearch> +  </Property> +  <Property Id="MYSQLD32LOCATION"> +  <DirectorySearch Id="Mysqld32Location" Path="[ProgramFiles]/MySQL" Depth="1"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </Property> +  <Property Id="MYSQLD64LOCATION"> +  <DirectorySearch Id="Mysqld64Location" Path="[ProgramFiles64]/MySQL" Depth="1"> +  <FileSearch LongName="mysqld.exe" /> +  </DirectorySearch> +  </Property> +  <Property Id="MYISAMCHK32LOCATION"> +  <DirectorySearch Id="Myisamchk32Location" Path="[ProgramFiles]/MySQL" Depth="1"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </Property> +  <Property Id="MYISAMCHK64LOCATION"> +  <DirectorySearch Id="Myisamchk64Location" Path="[ProgramFiles64]/MySQL" Depth="1"> +  <FileSearch LongName="myisamchk.exe" /> +  </DirectorySearch> +  </Property>    <AdminExecuteSequence>    <Custom Action="DONT_INSTALL_SERVICE" Before="DIRCA_TARGETDIR">NOT VersionNT</Custom>    <Custom Action="DIRCA_TARGETDIR" Before="CostInitialize"><![CDATA[TARGETDIR=""]]></Custom>
1191:    <Custom Action="RemoveOldService" After="SetRemoveOldService">REMOVE="" AND INSTALL_SERVICE="1"</Custom>    <Custom Action="SetCreateConfigInterface" Sequence="5100">REMOVE=""</Custom>    <Custom Action="CreateConfigInterface" After="SetCreateConfigInterface">(REMOVE="") AND (OLDCONFIGDIR="")</Custom> -  <Custom Action="SetCreatePikeLocation" After="CreateConfigInterface">REMOVE=""</Custom> +  <Custom Action="SetCreateMysql32Location" After="CreateConfigInterface">REMOVE="" AND MYSQLD32LOCATION&lt;&gt;""</Custom> +  <Custom Action="SetCreateMysql64Location" After="SetCreateMysql32Location">REMOVE="" AND MYSQLD64LOCATION&lt;&gt;""</Custom> +  <Custom Action="CreateMysqlLocation" After="SetCreateMysql64Location">REMOVE=""</Custom> +  <Custom Action="SetCreatePikeLocation" After="CreateMysqlInterface">REMOVE=""</Custom>    <Custom Action="CreatePikeLocation" After="SetCreatePikeLocation">REMOVE=""</Custom>    <Custom Action="SetCreateEnvironment" After="CreatePikeLocation">REMOVE=""</Custom>    <Custom Action="CreateEnvironment" After="SetCreateEnvironment">REMOVE=""</Custom>