diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-04-28 10:25:50 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-04-28 10:26:59 -0400 |
| commit | 78ca1d510c6bf74677558c4c7da0c20679906eab (patch) | |
| tree | 9567c99d6052a30c4940b860e48b33afd21f5a7f /src/mongo/installer | |
| parent | 167a06199ece7743400d169b9c22980be04dc60a (diff) | |
| download | mongo-78ca1d510c6bf74677558c4c7da0c20679906eab.tar.gz | |
SERVER-23519 Change Windows Builders to VS2015, and require VS2015
Diffstat (limited to 'src/mongo/installer')
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 10 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index f17d3523464..6099262eacf 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -133,9 +133,17 @@ env.Command(objects, #light: link .objs into an msi pre_msi = "$BUILD_DIR/msi/${SERVER_DIST_BASENAME}.pre.msi" + +# Suppress VC140_CRT_CRT.MSM Internal Consistency Errors +# ICE03 - Supress "String overflow" +# -- https://msdn.microsoft.com/en-us/library/windows/desktop/aa369037(v=vs.85).aspx +# ICE82 - Suppress "duplicate sequence number" +# -- https://msdn.microsoft.com/en-us/library/windows/desktop/aa368798(v=vs.85).aspx +# + pre_msi_cmd = env.Command(pre_msi, objects, - '"$WIXLIGHT" -out ${TARGET} -wx -cultures:null -sice:ICE82 ' + '"$WIXLIGHT" -out ${TARGET} -wx -cultures:null -sice:ICE82 -sice:ICE03' ' -ext "$WIXUIEXT"' ' ${SOURCES}') diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 08de8d90e01..680da130d55 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -123,7 +123,7 @@ <?if $(var.Edition) = Enterprise or $(var.Edition) = SSL ?> <DirectoryRef Id="TARGETDIR"> - <Merge Id="m_vcredist" SourceFile="$(var.MergeModulesBasePath)\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0"/> + <Merge Id="m_vcredist" SourceFile="$(var.MergeModulesBasePath)\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0"/> </DirectoryRef> <?endif ?> |