diff options
| author | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-10-23 16:00:07 -0700 |
|---|---|---|
| committer | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-10-28 13:17:13 +0530 |
| commit | 063359489fb718845d1db8dc9185a7f9ebe3e6ab (patch) | |
| tree | 98a67a8800a9d4d1cf2dfc47acf61c01531e1679 /buildscripts/packaging | |
| parent | 911461fc883aa34e0deec661261f0ea5486c105e (diff) | |
| download | mongo-063359489fb718845d1db8dc9185a7f9ebe3e6ab.tar.gz | |
SERVER-11341 - Added merge module as a variable to wixproj and buildenterprisemsi.bat
Diffstat (limited to 'buildscripts/packaging')
| -rwxr-xr-x | buildscripts/packaging/msi/MongoDB_64.wixproj | 3 | ||||
| -rw-r--r-- | buildscripts/packaging/msi/buildenterprisemsi.bat | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/buildscripts/packaging/msi/MongoDB_64.wixproj b/buildscripts/packaging/msi/MongoDB_64.wixproj index 8b9d588106e..569b89b61a3 100755 --- a/buildscripts/packaging/msi/MongoDB_64.wixproj +++ b/buildscripts/packaging/msi/MongoDB_64.wixproj @@ -29,8 +29,9 @@ <Source Condition=" '$(Source)' == '' ">..\..\..\build\win32\64\mongo</Source>
<SslSource Condition=" '$(SslSource)' == '' ">..\..\..\build\win32\64\mongo</SslSource>
<Version Condition=" '$(Version)' == '' ">2.4.0</Version>
+ <MergeModulesBasePath Condition=" '$(MergeModulesBasePath)' == '' ">C:\Program Files (x86)\Common Files\Merge Modules</MergeModulesBasePath>
<ClientHeaderSource Condition=" '$(ClientHeaderSource)' == '' ">..\..\..\build\win32\normal\clientlib\include</ClientHeaderSource>
- <DefineConstants>MongoDBVersion=$(Version);LicenseSource=$(License);BinarySource=$(Source);Edition=$(Edition);SaslSource=$(SaslSource);SslSource=$(SslSource);SnmpSource=$(SnmpSource);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode);Flavor=$(Flavor);ClientSource=$(ClientSource);EnterpriseBase=$(EnterpriseBase);ClientHeaderSource=$(ClientHeaderSource)</DefineConstants>
+ <DefineConstants>MongoDBVersion=$(Version);LicenseSource=$(License);BinarySource=$(Source);Edition=$(Edition);SaslSource=$(SaslSource);SslSource=$(SslSource);SnmpSource=$(SnmpSource);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode);Flavor=$(Flavor);ClientSource=$(ClientSource);EnterpriseBase=$(EnterpriseBase);ClientHeaderSource=$(ClientHeaderSource);MergeModulesBasePath=$(MergeModulesBasePath)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<VerboseOutput>True</VerboseOutput>
diff --git a/buildscripts/packaging/msi/buildenterprisemsi.bat b/buildscripts/packaging/msi/buildenterprisemsi.bat index e1880d3b1fd..821d07ba2d5 100644 --- a/buildscripts/packaging/msi/buildenterprisemsi.bat +++ b/buildscripts/packaging/msi/buildenterprisemsi.bat @@ -10,6 +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
:loop
IF NOT "%1"=="" (
@@ -49,10 +50,14 @@ IF NOT "%1"=="" ( SET CLIENTHEADERDIR=%2
SHIFT
)
+ IF "%1"=="-mergemodulesbasepath" (
+ SET MERGEMODULESBASEPATH=%2
+ SHIFT
+ )
SHIFT
GOTO :loop
)
ECHO Building enterprise msi for version %VERSION% with binaries from %BINDIR%, sasl from %SASLDIR%, ssl from %OPENSSLDIR%, snmp from %SNMPDIR% and license files from %LICENSEDIR%
-%WINDIR%\Microsoft.NET\Framework64\v4.0.30319\msbuild /p:Configuration=Release;Version=%VERSION%;License=%LICENSEDIR%;Source=%BINDIR%;SaslSource=%SASLDIR%;SnmpSource=%SNMPDIR%;SslSource=%OPENSSLDIR%;Edition=%EDITION%;Flavor=%FLAVOR%;ClientSource=%CLIENTLIBDIR%;EnterpriseBase=%ENTERPRISEBASEDIR%;ClientHeaderSource=%CLIENTHEADERDIR% MongoDB_64.wixproj
+%WINDIR%\Microsoft.NET\Framework64\v4.0.30319\msbuild /p:Configuration=Release;Version=%VERSION%;License=%LICENSEDIR%;Source=%BINDIR%;SaslSource=%SASLDIR%;SnmpSource=%SNMPDIR%;SslSource=%OPENSSLDIR%;Edition=%EDITION%;Flavor=%FLAVOR%;ClientSource=%CLIENTLIBDIR%;EnterpriseBase=%ENTERPRISEBASEDIR%;ClientHeaderSource=%CLIENTHEADERDIR%;MergeModulesBasePath=%MERGEMODULESBASEPATH% MongoDB_64.wixproj
|