Swiftdiff options
Diffstat (limited to 'Swift/Packaging/WiX/Swift.wxs')
| -rw-r--r-- | Swift/Packaging/WiX/Swift.wxs | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Swift/Packaging/WiX/Swift.wxs b/Swift/Packaging/WiX/Swift.wxs index 782f425..c14f23d 100644 --- a/Swift/Packaging/WiX/Swift.wxs +++ b/Swift/Packaging/WiX/Swift.wxs @@ -8,5 +8,5 @@ <Product Name='Swift' Id='*' UpgradeCode='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF' Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Swift.im'> - <Package Id='*' Keywords='Installer' Description="Swift Installer" Comments="Swift is available under the GPL version 3" Manufacturer="Swift.im" InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252'/> + <Package Id='*' Keywords='Installer' Description="Swift Installer" Comments="Swift is available under the GPL version 3" Manufacturer="Swift.im" InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' InstallScope="perMachine"/> <Media Id='1' Cabinet='Swift.cab' EmbedCab='yes'/> @@ -14,7 +14,10 @@ <Directory Id='TARGETDIR' Name='SourceDir'> + <!-- Disabling CRT merge module, because it's not working + <Merge Id="CRT" DiskId="1" Language="0" SourceFile="$(var.VCCRTFile)"/> + --> + <Directory Id='ProgramFilesFolder' Name='PFiles'> <!--<Directory Id='INSTALLDIR' Name='Swift'> - </Directory>--> </Directory> @@ -31,13 +34,9 @@ <Directory Id="DesktopFolder" Name="Desktop" /> - - <Merge Id="CRT" DiskId="1" Language="1033" SourceFile="$(var.VCCRTFile)"/> </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' />--> - <MergeRef Id="CRT"/> </Feature> @@ -53,4 +52,17 @@ <Icon Id="Swift.exe" SourceFile="Swift.exe" /> <Property Id="ARPPRODUCTICON" Value="Swift.exe"/> <!-- The icon in the "Programs" dialog --> + + <!-- + VC Redistributable + --> + + <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> |