diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-11-30 12:21:32 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-11-30 12:21:32 -0500 |
| commit | 9cd3e82adeff890082f7d52e84fe5c9f876eb26a (patch) | |
| tree | bd805ba488febd61f246df158ada92419f9cc0d9 /src/mongo/installer | |
| parent | faa8f2606a8e8576797a7d3eec063cfc43e60709 (diff) | |
| download | mongo-9cd3e82adeff890082f7d52e84fe5c9f876eb26a.tar.gz | |
SERVER-21669: Add mongodecrypt.exe build-time dependency to Windows MSI
Diffstat (limited to 'src/mongo/installer')
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index 72be7edc0d8..f17d3523464 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -133,12 +133,15 @@ env.Command(objects, #light: link .objs into an msi pre_msi = "$BUILD_DIR/msi/${SERVER_DIST_BASENAME}.pre.msi" -env.Command(pre_msi, +pre_msi_cmd = env.Command(pre_msi, objects, '"$WIXLIGHT" -out ${TARGET} -wx -cultures:null -sice:ICE82 ' ' -ext "$WIXUIEXT"' ' ${SOURCES}') +if 'enterprise' in env['MONGO_MODULES']: + env.Depends(pre_msi_cmd, "#" + enterpriseToolBuildDir + "/mongodecrypt.exe") + msi = "$BUILD_DIR/msi/${SERVER_DIST_BASENAME}.msi" env.Command(msi, pre_msi, |