diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-08-23 08:02:47 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-08-23 08:07:57 -0400 |
| commit | c9c9ad1a63f623b0d291008d509efbbd2a2d14bf (patch) | |
| tree | 7f525b76b7eb627fc1850f9ec4fea54dd45259a0 /src/mongo/installer | |
| parent | 7bd0ff3817c22f14dd8e452e515646f7db0f29b1 (diff) | |
| download | mongo-c9c9ad1a63f623b0d291008d509efbbd2a2d14bf.tar.gz | |
SERVER-25705 Add mongoldap enterprise binary to Windows MSI
Diffstat (limited to 'src/mongo/installer')
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 6 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index 6099262eacf..b923ec5a6c7 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -149,6 +149,7 @@ pre_msi_cmd = env.Command(pre_msi, if 'enterprise' in env['MONGO_MODULES']: env.Depends(pre_msi_cmd, "#" + enterpriseToolBuildDir + "/mongodecrypt.exe") + env.Depends(pre_msi_cmd, "#" + enterpriseToolBuildDir + "/mongoldap.exe") msi = "$BUILD_DIR/msi/${SERVER_DIST_BASENAME}.msi" env.Command(msi, diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 680da130d55..01c7d639612 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -65,7 +65,11 @@ <?if $(var.Edition) = Enterprise ?> <Component Id="c_mongodecrypt" Guid="B81B0CED-8CAD-4A92-BABC-7C473BBFF44E"> <File Id="f_mongodecrypt" Name="mongodecrypt.exe" Source="$(var.EnterpriseToolBinarySource)\mongodecrypt.exe" - DiskId ="1" KeyPath="yes"/> + DiskId="1" KeyPath="yes"/> + </Component> + <Component Id="c_mongoldap" Guid="553E4E3D-ED32-4ABA-8F27-3A7525C3145C"> + <File Id="f_mongoldap" Name="mongoldap.exe" Source="$(var.EnterpriseToolBinarySource)\mongoldap.exe" + DiskId="1" KeyPath="yes"/> </Component> <Component Id="c_sasl" Guid="6632B1B8-9F0C-452C-9101-BE6044471CAC"> <File Id="f_sasl" Name="libsasl.dll" Source="$(var.SaslSource)\libsasl.dll" diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs index 88909fcb3a7..1f8dff61d73 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -2,7 +2,7 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <?if $(var.Edition) = Enterprise ?> - <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongodecrypt, mongofiles, mongooplog, mongoperf)" /> + <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongodecrypt, mongofiles, mongoldap, mongooplog, mongoperf)" /> <?else?> <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongofiles, mongooplog, mongoperf)" /> <?endif?> @@ -93,6 +93,7 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> <ComponentRef Id="c_mongodecrypt"/> + <ComponentRef Id="c_mongoldap"/> <?endif ?> <?if $(var.Edition) = SSL ?> <ComponentGroupRef Id="cg_SSLBase" /> |