diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2018-11-28 14:06:32 -0500 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2018-12-03 09:04:44 -0500 |
| commit | d97e59dd33cdd31b9fbcfd25f7cc8c9579a9ece9 (patch) | |
| tree | e48c5181d718283551611fde2b0fb87f9ed9a3ab /src/mongo/installer/msi | |
| parent | 88bcf424bc9830454847f015757ad710ee30827d (diff) | |
| download | mongo-d97e59dd33cdd31b9fbcfd25f7cc8c9579a9ece9.tar.gz | |
SERVER-38157 Add abseil-cpp to THIRD-PARTY-NOTICES
Make enterprise msi installer include both community and enterprise
THIRD-PARTY-NOTICES files.
Diffstat (limited to 'src/mongo/installer/msi')
| -rw-r--r-- | src/mongo/installer/msi/wxs/LicensingFragment.wxs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mongo/installer/msi/wxs/LicensingFragment.wxs b/src/mongo/installer/msi/wxs/LicensingFragment.wxs index 82bf0a136e7..2ff91b3fe57 100644 --- a/src/mongo/installer/msi/wxs/LicensingFragment.wxs +++ b/src/mongo/installer/msi/wxs/LicensingFragment.wxs @@ -9,7 +9,11 @@ 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"
+ <File Id="f_Thirdparty" Name="THIRD-PARTY-NOTICES" Source="$(var.LicenseSource)\THIRD-PARTY-NOTICES"
+ DiskId ="1" KeyPath="yes" />
+ </Component>
+ <Component Id="c_ThirdpartyEnterprise" Guid="4D53FF2F-DB47-41F3-8C5C-4C397736724E">
+ <File Id="f_ThirdpartyEnterprise" Name="THIRD-PARTY-NOTICES.windows" Source="$(var.EnterpriseBase)\distsrc\THIRD-PARTY-NOTICES.windows"
DiskId ="1" KeyPath="yes" />
</Component>
@@ -20,7 +24,7 @@ </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" />
+ DiskId ="1" KeyPath="yes" />
</Component>
<?endif?>
@@ -43,6 +47,9 @@ <ComponentGroup Id="cg_License">
<ComponentRef Id="c_Readme"/>
<ComponentRef Id="c_Thirdparty"/>
+ <?if $(var.Edition) = Enterprise ?>
+ <ComponentRef Id="c_ThirdpartyEnterprise"/>
+ <?endif?>
<ComponentRef Id="c_License"/>
<ComponentRef Id="c_InstallKey"/>
<ComponentRef Id="c_MPL2"/>
|