diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2013-10-22 21:25:28 -0400 |
|---|---|---|
| committer | Ernie Hershey <ernie.hershey@10gen.com> | 2013-10-23 12:28:14 -0400 |
| commit | f797a11b08fc27b03029e13d0f51549c1e1944ba (patch) | |
| tree | b1eed9de0f9eb161f6e6038fa699d2086b00c4e8 /src/mongo/installer | |
| parent | 931356acb43c115ca6430338ff5c69fc39ac3a16 (diff) | |
| download | mongo-f797a11b08fc27b03029e13d0f51549c1e1944ba.tar.gz | |
SERVER-10830 use $WIX and $MERGEMODULESBASEPATH for enterprise msi
Diffstat (limited to 'src/mongo/installer')
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 7 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index f7400605225..f06185c6fe0 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -1,5 +1,7 @@ # -*- mode: python; -*- +import os + Import("env") Import("installSetup") Import("windows") @@ -10,11 +12,13 @@ Import("s3push") driverIncludeSource = "$BUILD_DIR/msi/DriverInclude.wxs" env = env.Clone() -env['WIXPATH'] = r'C:\Program Files (x86)\WiX Toolset v3.7\bin' +env['WIX'] = os.environ['WIX'] +env['WIXPATH'] = r'$WIX\bin' env['WIXHEAT'] = r'$WIXPATH\heat.exe' env['WIXCANDLE'] = r'$WIXPATH\candle.exe' env['WIXLIGHT'] = r'$WIXPATH\light.exe' env['WIXUIEXT'] = r'$WIXPATH\WixUIExtension.dll' +env['MERGEMODULESBASEPATH'] = os.environ['MERGEMODULESBASEPATH'] sources = [ driverIncludeSource, "wxs/BinaryFragment.wxs", @@ -48,6 +52,7 @@ env.Command(objects, ' -dLicenseSource=distsrc' r' -dEnterpriseBase=src\mongo\db\modules\subscription\\' ' -dBinarySource=' + buildDir + r'\mongo' + ' -dMergeModulesBasePath="$MERGEMODULESBASEPATH"' ' -dEdition=Enterprise' ' -d"ProductId=*\"' ' -dUpgradeCode=FCF901F6-E963-40B1-9A17-978242068587' diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 8c50f06c45b..04a8679cbe5 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -148,7 +148,7 @@ --> <?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"/> + <Merge Id="m_vcredist" SourceFile="$(var.MergeModulesBasePath)\Microsoft_VC100_CRT_x64.msm" DiskId="1" Language="0"/> </DirectoryRef> <ComponentGroup Id="cg_EnterpriseBase"> |