diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-11-25 10:42:07 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-11-30 11:28:11 -0500 |
| commit | faa8f2606a8e8576797a7d3eec063cfc43e60709 (patch) | |
| tree | 39af07eed77a9b471bd3ffe5ca2d1c3677f0712c | |
| parent | 3a39650ea23ef334499d1a85e03b4be85c6f6a2f (diff) | |
| download | mongo-faa8f2606a8e8576797a7d3eec063cfc43e60709.tar.gz | |
SERVER-21669: Add mongodecrypt.exe to Windows MSI
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 4 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index 13d820a4a34..72be7edc0d8 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -31,6 +31,7 @@ else: toolBuildDir = buildDir + r'\mongo' enterprisebase = 'src\mongo\db\modules\enterprise' +enterpriseToolBuildDir = buildDir + r'\mongo\db\modules\enterprise' # Set up parameters to pass to wix - # @@ -106,6 +107,7 @@ env.Command(objects, r' -dEnterpriseBase=' + enterprisebase + '\\' ' -dBinarySource=' + buildDir + r'\mongo' ' -dToolBinarySource=' + toolBuildDir + + ' -dEnterpriseToolBinarySource=' + enterpriseToolBuildDir + ' -dMergeModulesBasePath="$MERGEMODULESBASEPATH"' ' -dEdition=' + msi_edition + ' -d"ProductId=*\"' diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 79be1af1c31..08de8d90e01 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -63,6 +63,10 @@ DiskId ="1" KeyPath="yes"/> </Component> <?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"/> + </Component> <Component Id="c_sasl" Guid="6632B1B8-9F0C-452C-9101-BE6044471CAC"> <File Id="f_sasl" Name="libsasl.dll" Source="$(var.SaslSource)\libsasl.dll" DiskId="1" KeyPath="yes" /> diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs index 8e2877cfbb3..88909fcb3a7 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <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)" /> + <?else?> + <WixVariable Id="MiscToolsDesc" Value="Miscellaneous MongoDB tools (bsondump, mongofiles, mongooplog, mongoperf)" /> + <?endif?> <FeatureGroup Id="fg_MongoDBAll"> <Feature Id="ProductFeature" Title="!(wix.ProductName)" @@ -79,7 +84,7 @@ </Feature> <Feature Id="MiscellaneousTools" Title ="Miscellaneous Tools" - Description="Miscellaneous MongoDB tools (bsondump, mongofiles, mongooplog, mongoperf)" + Description="!(wix.MiscToolsDesc)" Level ="1"> <ComponentRef Id="c_bsondump"/> <ComponentRef Id="c_mongofiles"/> @@ -87,6 +92,7 @@ <ComponentRef Id="c_mongoperf"/> <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> + <ComponentRef Id="c_mongodecrypt"/> <?endif ?> <?if $(var.Edition) = SSL ?> <ComponentGroupRef Id="cg_SSLBase" /> |