diff options
| author | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-12-04 10:01:52 -0800 |
|---|---|---|
| committer | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-12-05 10:01:10 -0800 |
| commit | 08fda16ab279ed379161b1e75c64d5462e98815e (patch) | |
| tree | f8a3c89364ad557e67c09925ded17596eaabfa02 /buildscripts | |
| parent | ea9033b729b3ca3f3158fd83094e1b7dd96a2b2f (diff) | |
| download | mongo-08fda16ab279ed379161b1e75c64d5462e98815e.tar.gz | |
SERVER-10900 - When building MSI for enterprise edition use third party notices file from enterprise repository
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/packaging/msi/MongoDB_64.wixproj | 2 | ||||
| -rw-r--r-- | buildscripts/packaging/msi/buildenterprisemsi.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/buildscripts/packaging/msi/MongoDB_64.wixproj b/buildscripts/packaging/msi/MongoDB_64.wixproj index 569b89b61a3..d3c3be6dcae 100755 --- a/buildscripts/packaging/msi/MongoDB_64.wixproj +++ b/buildscripts/packaging/msi/MongoDB_64.wixproj @@ -57,7 +57,7 @@ </ItemGroup>
<Import Project="$(WixTargetsPath)" />
<PropertyGroup>
- <PreBuildEvent>"%WIX%\bin\heat.exe" dir $(ClientHeaderSource) -gg -g1 -frag -cg cg_DriverHeaders -nologo -directoryid -out DriverInclude.wxs -dr Header -srd -var var.ClientHeaderSource</PreBuildEvent>
+ <PreBuildEvent>"%WIX%\bin\heat.exe" dir "$(ClientHeaderSource)" -gg -g1 -frag -cg cg_DriverHeaders -nologo -directoryid -out DriverInclude.wxs -dr Header -srd -var var.ClientHeaderSource</PreBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/buildscripts/packaging/msi/buildenterprisemsi.bat b/buildscripts/packaging/msi/buildenterprisemsi.bat index 821d07ba2d5..c9bba5bf73d 100644 --- a/buildscripts/packaging/msi/buildenterprisemsi.bat +++ b/buildscripts/packaging/msi/buildenterprisemsi.bat @@ -10,7 +10,7 @@ SET SASLDIR=..\..\..\..\..\..\Utils\sasl\bin SET OPENSSLDIR=..\..\..\..\..\..\Utils\openssl\bin
SET SNMPDIR=..\..\..\..\..\..\Utils\snmp\bin
SET CLIENTHEADERDIR=..\..\..\build\win32\normal\client_build\include
-SET MERGEMODULESBASEPATH=C:\Program Files (x86)\Common Files\Merge Modules
+SET MERGEMODULESBASEPATH="C:\Program Files (x86)\Common Files\Merge Modules"
:loop
IF NOT "%1"=="" (
|