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 | |
| parent | ea9033b729b3ca3f3158fd83094e1b7dd96a2b2f (diff) | |
| download | mongo-08fda16ab279ed379161b1e75c64d5462e98815e.tar.gz | |
SERVER-10900 - When building MSI for enterprise edition use third party notices file from enterprise repository
| -rwxr-xr-x | buildscripts/packaging/msi/MongoDB_64.wixproj | 2 | ||||
| -rw-r--r-- | buildscripts/packaging/msi/buildenterprisemsi.bat | 2 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/LicensingFragment.wxs | 22 |
3 files changed, 13 insertions, 13 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"=="" (
diff --git a/src/mongo/installer/msi/wxs/LicensingFragment.wxs b/src/mongo/installer/msi/wxs/LicensingFragment.wxs index c876377bdeb..53ab077c839 100644 --- a/src/mongo/installer/msi/wxs/LicensingFragment.wxs +++ b/src/mongo/installer/msi/wxs/LicensingFragment.wxs @@ -4,8 +4,12 @@ <DirectoryRef Id="INSTALLLOCATION"> <?if $(var.Edition) = Enterprise ?> - <Component Id="c_EnterpriseLicense" Guid="C0EF85E2-95F8-468B-BA95-2F739C63D2D7"> - <File Id="f_EnterpriseLicense" Name="LICENSE.txt" Source="$(var.EnterpriseBase)\distsrc\LICENSE.txt" + <Component Id="c_License" Guid="C0EF85E2-95F8-468B-BA95-2F739C63D2D7"> + <File Id="f_License" Name="LICENSE.txt" Source="$(var.EnterpriseBase)\distsrc\LICENSE.txt" + DiskId ="1" KeyPath="yes" /> + </Component> + <Component Id="c_Thirdparty" Guid="C45662A7-5C18-4A53-8D14-7C92DB38F13E"> + <File Id="f_Thirdparty" Name="THIRD-PARTY-NOTICES" Source="$(var.EnterpriseBase)\distsrc\THIRD-PARTY-NOTICES.windows" DiskId ="1" KeyPath="yes" /> </Component> <?else?> @@ -13,25 +17,21 @@ <File Id="f_GnuLicense" Name="GNU-AGPL-3.0" Source="$(var.LicenseSource)\GNU-AGPL-3.0" DiskId ="1" KeyPath="yes" /> </Component> + <Component Id="c_Thirdparty" Guid="D6098364-6DE8-48EA-A955-7D1060752132"> + <File Id="f_Thirdparty" Name="THIRD-PARTY-NOTICES" Source="$(var.LicenseSource)\THIRD-PARTY-NOTICES" + DiskId ="1" /> + </Component> <?endif?> <Component Id="c_Readme" Guid="12C17EA1-075C-4A1D-9554-F3B5A2A94874"> <File Id="f_Readme" Name="README" Source="$(var.LicenseSource)\README" DiskId ="1" /> </Component> - <Component Id="c_Thirdparty" Guid="D6098364-6DE8-48EA-A955-7D1060752132"> - <File Id="f_Thirdparty" Name="THIRD-PARTY-NOTICES" Source="$(var.LicenseSource)\THIRD-PARTY-NOTICES" - DiskId ="1" /> - </Component> </DirectoryRef> <ComponentGroup Id="cg_License"> <ComponentRef Id="c_Readme"/> <ComponentRef Id="c_Thirdparty"/> - <?if $(var.Edition) = Enterprise ?> - <ComponentRef Id="c_EnterpriseLicense"/> - <?else?> - <ComponentRef Id="c_License"/> - <?endif?> + <ComponentRef Id="c_License"/> </ComponentGroup> <?if $(var.Edition) = Enterprise ?> |