diff options
| author | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-10-09 14:26:53 -0700 |
|---|---|---|
| committer | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-10-11 10:36:35 -0700 |
| commit | 332e4f1a23b182a278b7a5ee8d458d184b266ac6 (patch) | |
| tree | 426b70bebf068464c8bae02a9e4b050fb2ccea7d /src/mongo/installer | |
| parent | bb7ba88009afc1691a9b954687cb0a18091f54f2 (diff) | |
| download | mongo-332e4f1a23b182a278b7a5ee8d458d184b266ac6.tar.gz | |
SERVER-11108 - non enterprise builds are not working
Diffstat (limited to 'src/mongo/installer')
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 7 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 6 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/Installer_64.wxs | 9 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 2c08b9648f8..8c50f06c45b 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -143,7 +143,14 @@ </Directory> </DirectoryRef> + <!-- + Only use VC redistributable on builds with /MD - for now, just Enterprise + --> <?if $(var.Edition) = Enterprise ?> + <DirectoryRef Id="TARGETDIR"> + <Merge Id="m_vcredist" SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\Microsoft_VC100_CRT_x64.msm" DiskId="1" Language="0"/> + </DirectoryRef> + <ComponentGroup Id="cg_EnterpriseBase"> <ComponentRef Id="c_sasl" /> <ComponentRef Id="c_saslPdb" /> diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs index 03ad76b0e8f..842c179ab21 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -7,9 +7,9 @@ Description="!(wix.ProductName)" Level="1" ConfigurableDirectory="INSTALLLOCATION"> - - <MergeRef Id="m_vcredist"/> - + <?if $(var.Edition) = Enterprise ?> + <MergeRef Id="m_vcredist"/> + <?endif?> <ComponentGroupRef Id="cg_License" /> <Feature Id="Server" Title ="Server" diff --git a/src/mongo/installer/msi/wxs/Installer_64.wxs b/src/mongo/installer/msi/wxs/Installer_64.wxs index 7ed9ab02f72..0dea590afdd 100644 --- a/src/mongo/installer/msi/wxs/Installer_64.wxs +++ b/src/mongo/installer/msi/wxs/Installer_64.wxs @@ -36,15 +36,6 @@ </Directory> </Directory> - <!-- - Only use VC redistributable on builds with /MD - for now, just Enterprise - --> - <?if $(var.Edition) = Enterprise ?> - <DirectoryRef Id="TARGETDIR"> - <Merge Id="m_vcredist" SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\Microsoft_VC100_CRT_x64.msm" DiskId="1" Language="0"/> - </DirectoryRef> - <?endif?> - <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" /> <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)Dialog.bmp" /> <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)Banner.bmp" /> |