Branch: Tag:

2004-11-29

2004-11-29 13:36:26 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Switched custom actions from commit to deferred.

Rev: server/etc/RoxenUI.wxs:1.16

11:    <CustomAction Id="VSDCA_FolderForm_AllUsers" Property="FolderForm_AllUsers" Value="ALL" />    <CustomAction Id="CreateConfigInterface" Directory="SERVERDIR"    ExeCommand='"[SERVERDIR]\pike\bin\pike" bin\create_configif.pike --batch server_name "[SERVER_NAME]" server_url "[SERVER_PROTOCOL]://*:[SERVER_PORT]/" user "[ADM_USER]" password "[ADM_PASS1]" ok y update n' -  Execute="commit" /> +  Execute="deferred" />    <CustomAction Id="CreatePikeLocation" Directory="SERVERDIR"    ExeCommand='"[SERVERDIR]\pike\bin\pike" -e "Stdio.write_file(argv[1], argv[2]);" "pikelocation.txt" "[SERVERDIR]\pike\bin\pike"' -  Execute="commit" /> +  Execute="deferred" />    <CustomAction Id="StartBrowser" Property="BROWSER"    ExeCommand="[SERVER_PROTOCOL]://localhost:[SERVER_PORT]/" -  Execute="commit" Return="asyncNoWait" /> +  Execute="deferred" Return="asyncNoWait" />    <UI>    <Property Id="ErrorDialog"><![CDATA[ErrorDialog]]></Property>    <Property Id="DefaultUIFont"><![CDATA[VsdDefaultUIFont.524F4245_5254_5341_4C45_534153783400]]></Property>
1122:    <RemoveExistingProducts After="InstallInitialize" />    <Custom Action="CreateConfigInterface" Sequence="4100">REMOVE=""</Custom>    <Custom Action="CreatePikeLocation" After="CreateConfigInterface">REMOVE=""</Custom> -  <InstallServices Sequence="4200" /> +     </InstallExecuteSequence>    <Binary Id="DefBannerBitmap" src="Banner.bmp" />    <Binary Id="UpFldrBtn" src="UpFldrBtn.icon" />    <Binary Id="NewFldrBtn" src="NewFldrBtn.icon" />    </Fragment>   </Wix>