Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-06-11 07:54:04 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-06-11 07:54:04 (GMT) |
| commit | 0d5c2da5c9d2491db90a65766b0224cd47a0f953 (patch) | |
| tree | 3f7e19bd6fde55d9a11e48aab6ee744db6c65dab | |
| parent | eb6fdb866e5ffd467ad0f08fb4bcc50a5af37a22 (diff) | |
| download | swift-contrib-0d5c2da5c9d2491db90a65766b0224cd47a0f953.zip swift-contrib-0d5c2da5c9d2491db90a65766b0224cd47a0f953.tar.bz2 | |
Fix vcredist bundling in WIX installer.
Change-Id: I499db0b68cc5e492a35d931b146094446e183682
| -rw-r--r-- | Swift/Packaging/WiX/Swift.wxs | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/Swift/Packaging/WiX/Swift.wxs b/Swift/Packaging/WiX/Swift.wxs index 4215679..c14f23d 100644 --- a/Swift/Packaging/WiX/Swift.wxs +++ b/Swift/Packaging/WiX/Swift.wxs @@ -23,56 +23,46 @@ </Directory> <Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuDir" Name="Swift"> <Component Id="Shortcuts" Guid="D3BB9B0A-5D14-4920-B127-7CCD2D57BFB0"> <RemoveFolder Id='ProgramMenuDir' On='uninstall' /> <RegistryValue Root='HKCU' Key='Software\Swift\Swift' Type='string' Value='' KeyPath='yes' /> <Shortcut Id='SwiftShortcut' Directory='ProgramMenuDir' Name='Swift' Target="[INSTALLDIR]\Swift.exe" Icon='Swift.exe'/> </Component> </Directory> </Directory> <Directory Id="DesktopFolder" Name="Desktop" /> </Directory> <Feature Id='Core' Level='1' Title='Swift' Description='All necessary Swift files' Display='expand' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no' Absent='disallow'> <ComponentGroupRef Id='Files' /> <!--<ComponentRef Id='Manual' />--> </Feature> <Feature Id='Shortcut' Level='1' Title='Shortcut' Description='Start Menu Shortcut' Display='expand' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'> <ComponentRef Id='Shortcuts' /> </Feature> <!--<UIRef Id='WixUI_Advanced'/>--> <!--<UIRef Id="WixUI_Minimal"/>--> <UIRef Id="WixUI_Mondo"/> <WixVariable Id='WixUILicenseRtf' Value='COPYING.rtf'/> <Icon Id="Swift.exe" SourceFile="Swift.exe" /> <Property Id="ARPPRODUCTICON" Value="Swift.exe"/> <!-- The icon in the "Programs" dialog --> <!-- VC Redistributable --> - <!-- Disabling CRT merge module, because it's not working - <Feature Id='CRT' Title='Visual C++ Runtime' AllowAdvertise='no' Display='hidden' Level='1'> - <MergeRef Id="CRT"/> - </Feature> - --> - <Binary Id="CRT.exe" SourceFile="$(var.VCCRTFile)"/> - <CustomAction Id="InstallCRT" Impersonate="yes" Return="ignore" Execute="immediate" BinaryKey="CRT.exe" ExeCommand="/qb"/> - <Property Id="CRT_INSTALLED" Secure="yes"> - <RegistrySearch Id="VC2008SP1REDIST_X86Value" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}" Name="Publisher" Type="raw" Win64="no" /> - </Property> - <!-- The following snippet should work for VC 2010 - <Upgrade Id='{1F4F1D2A-D9DA-32CF-9909-48485DA06DD5}'> - <UpgradeVersion OnlyDetect='yes' Property='CRT_INSTALLED' Minimum='10.0.40219' IncludeMinimum='yes'/> - </Upgrade> - --> - <InstallUISequence> - <Custom Action="InstallCRT" After="ProgressDlg">Not Installed And Not CRT_INSTALLED</Custom> - </InstallUISequence> + + <Binary Id="CRTBinary" SourceFile="$(var.VCCRTFile)"/> + + <CustomAction Id="CRTAction" Impersonate="no" Return="asyncNoWait" Execute="deferred" BinaryKey="CRTBinary" ExeCommand="/passive"/> + + <InstallExecuteSequence> + <Custom Action='CRTAction' After='InstallInitialize'/> + </InstallExecuteSequence> </Product> </Wix> |