diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-11-22 15:15:05 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-11-22 15:15:05 +0300 |
| commit | bbd93e1158199e2103e2093d3a77a2422cbd23d7 (patch) | |
| tree | 84ba323668bef77dc464959fd265d64e378ea5e3 /installer | |
| parent | c19ec3f82da41dd2909176a3cdda05da7574230c (diff) | |
installer: remove support for merge modules.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Product.wxs | 10 | ||||
| -rw-r--r-- | installer/Settings.wxi | 35 |
2 files changed, 10 insertions, 35 deletions
diff --git a/installer/Product.wxs b/installer/Product.wxs index 5065ab1c9..547dacccf 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -54,10 +54,6 @@ <Directory Id="$(var.ArchSpecificProgramFilesFolderId)"> <Directory Id="INSTALLDIR" Name="$(var.ProductName)"> </Directory> - - <?ifdef MergeModuleDir ?> - <Merge Id="VCRedist" SourceFile="$(var.MergeModuleDir)\Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="1033" /> - <?endif ?> </Directory> <Directory Id="DesktopFolder" /> @@ -179,12 +175,6 @@ <ComponentRef Id="NSISUninstall" /> </Feature> - <?ifdef MergeModuleDir ?> - <Feature Id="VCRedist" Title="Visual C++ 10.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1"> - <MergeRef Id="VCRedist"/> - </Feature> - <?endif ?> - <InstallExecuteSequence> <AppSearch Sequence='1' /> <Custom Action="SetNSISPath" After="AppSearch">NSISINSTALL</Custom> diff --git a/installer/Settings.wxi b/installer/Settings.wxi index d6daccc42..f8f5aa7f4 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -90,32 +90,17 @@ <?define ZlibDir = "$(env.MumbleZlibDir)" ?> <?endif ?> - <!-- - Note: in order to use merge modules with MSVS 2013 (VCRedist 12.0), - you need to bump the InstallerVersion in Product.wxs to 405. - --> - <?ifndef env.MumbleMergeModuleDir ?> - <?ifndef env.MumbleNoMergeModule ?> - <?define MergeModuleDir = "C:\Program Files (x86)\Common Files\Merge Modules" ?> - <?endif ?> - <?else ?> - <?define MergeModuleDir = "$(env.MumbleMergeModuleDir)" ?> - <?endif ?> - - <!-- If the MumbleNoMergeModule env var is set, prefer embedding the .DLLs directly into the installer. --> - <?ifdef env.MumbleNoMergeModule ?> - <!-- But, if the MumbleNoEmbedVCRedist env var is set, don't embed them anyway. --> - <?ifndef env.MumbleNoEmbedVCRedist ?> - <?ifndef env.MumbleRedistDirVC12 ?> - <?if $(sys.BUILDARCH) = "x86" ?> - <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT" ?> - <?elseif $(sys.BUILDARCH) = "x64" ?> - <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT" ?> - <?endif ?> - <?else ?> - <?define RedistDirVC12 = "$(env.MumbleRedistDirVC12)" ?> + <!-- Don't embed VCRedist files if MumbleNoEmbedVCRedist env var is set. --> + <?ifndef env.MumbleNoEmbedVCRedist ?> + <?ifndef env.MumbleRedistDirVC12 ?> + <?if $(sys.BUILDARCH) = "x86" ?> + <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT" ?> + <?elseif $(sys.BUILDARCH) = "x64" ?> + <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT" ?> <?endif ?> - <?endif ?> + <?else ?> + <?define RedistDirVC12 = "$(env.MumbleRedistDirVC12)" ?> + <?endif ?> <?endif ?> <?define Win81SDKDir = "C:\Program Files (x86)\Windows Kits\8.1" ?> |