Skip to content

Commit

Permalink
[TIDESK-506] No longer run Titanium installer in MSI.
Browse files Browse the repository at this point in the history
Running the Titanium net installer within the MSI appears
to trigger some odd crash. Instead we will not invoke it within the Windows
installer. When the application first runs it will check to see if it needs
to download any components. If so it will trigger the installer then.
  • Loading branch information
Josh Roesslein committed Jul 18, 2011
1 parent 01b464e commit aae25af
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions sdk/win32/installer_template.wxs
Expand Up @@ -51,20 +51,10 @@ ${component_refs}
<Icon Id="ApplicationIcon.exe" SourceFile=${app_exe} />
<Property Id="ARPPRODUCTICON" Value="ApplicationIcon.exe" />

<!-- the "immediate" setup action exists to initialize the progress bar with our job count -->
<!-- ugly hack to pass in our dependenices and bundled modules/runtime into the deferred/async action -->
<CustomAction Id="NetInstall.Params" Return="check" Property="NetInstall" Value="${dependencies}"/>
<CustomAction Id="NetInstall.Setup" BinaryKey="TitaniumInstallerDll" DllEntry="NetInstall" Execute="immediate"/>
<CustomAction Id="NetInstall" BinaryKey="TitaniumInstallerDll" DllEntry="NetInstall" Execute="deferred"/>

<InstallExecuteSequence>
<RemoveExistingProducts After="InstallInitialize"/>
<Custom Action="NetInstall.Params" After="InstallFiles">NOT Installed</Custom>
<Custom Action="NetInstall.Setup" After="NetInstall.Params">NOT Installed</Custom>
<Custom Action="NetInstall" After="NetInstall.Setup">NOT Installed</Custom>
</InstallExecuteSequence>

<Binary Id="TitaniumInstallerDll" SourceFile=${titanium_installer_dll}/>
<Binary Id="BannerBmp" SourceFile=${banner_bmp}/>

<UIRef Id="WixUI_Common" />
Expand Down

0 comments on commit aae25af

Please sign in to comment.