diff options
| author | Eric Milkie <milkie@10gen.com> | 2013-10-16 07:42:39 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2013-10-16 07:42:46 -0400 |
| commit | 4850a6ae10601226642c6594f3b93e052d62bdf6 (patch) | |
| tree | 9bf67ca4428ec17d78f1f5ba4f44dfbdda3ae400 | |
| parent | 94ce941611abf2fd3826936a90d93b09e483d99c (diff) | |
| download | mongo-4850a6ae10601226642c6594f3b93e052d62bdf6.tar.gz | |
SERVER-10830 temporarily hardcode the WiX path because Cygwin doesn't work well with environment vars
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index 6522e282feb..f7400605225 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -10,7 +10,7 @@ Import("s3push") driverIncludeSource = "$BUILD_DIR/msi/DriverInclude.wxs" env = env.Clone() -env['WIXPATH'] = r'%WIX%bin' +env['WIXPATH'] = r'C:\Program Files (x86)\WiX Toolset v3.7\bin' env['WIXHEAT'] = r'$WIXPATH\heat.exe' env['WIXCANDLE'] = r'$WIXPATH\candle.exe' env['WIXLIGHT'] = r'$WIXPATH\light.exe' @@ -62,9 +62,9 @@ env.Command(objects, ' -dTargetDir=' + buildDir + r'\msi' ' -dTargetExt=.msi' ' -dTargetFileName=${SERVER_ARCHIVE}' - r' -dSaslSource=d:\work\sasl\bin' - r' -dSnmpSource=d:\work\snmp\bin' - r' -dSslSource=d:\work\ssl\bin' + r' -dSaslSource=c:\sasl\bin' + r' -dSnmpSource=c:\snmp\bin' + r' -dSslSource=c:\openssl\bin' ' -out ' + buildDir + r'\msi\\' ' -arch x64' ' -ext "$WIXUIEXT"' |