SERVER-10792 - Account for enterprise license in enterprise build

4 files changed, 39 insertions, 8 deletions

diff --git a/buildscripts/packaging/msi/MongoDB_64.wixproj b/buildscripts/packaging/msi/MongoDB_64.wixproj
index 02748882ec7..07ea77c40f9 100755
--- a/buildscripts/packaging/msi/MongoDB_64.wixproj
+++ b/buildscripts/packaging/msi/MongoDB_64.wixproj
@@ -23,12 +23,13 @@
     <Edition Condition=" '$(Edition)' == '' ">Standard</Edition>

     <Flavor Condition=" '$(Flavor)' == '' ">2008R2Plus</Flavor>

     <License Condition=" '$(License)' == '' ">..\..\..\distsrc</License>

+    <EnterpriseLicense Condition=" '$(EnterpriseLicense)' == '' ">..\..\..\distsrc</EnterpriseLicense>

     <SaslSource Condition=" '$(SaslSource)' == '' ">..\..\..\build\win32\64\mongo</SaslSource>

     <SnmpSource Condition=" '$(SnmpSource)' == '' ">..\..\..\build\win32\64\mongo</SnmpSource>

     <Source Condition=" '$(Source)' == '' ">..\..\..\build\win32\64\mongo</Source>

     <SslSource Condition=" '$(SslSource)' == '' ">..\..\..\build\win32\64\mongo</SslSource>

     <Version Condition=" '$(Version)' == '' ">2.4.0</Version>

-    <DefineConstants>MongoDBVersion=$(Version);LicenseSource=$(License);BinarySource=$(Source);Edition=$(Edition);SaslSource=$(SaslSource);SslSource=$(SslSource);SnmpSource=$(SnmpSource);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode);Flavor=$(Flavor);ClientSource=$(ClientSource)</DefineConstants>

+    <DefineConstants>MongoDBVersion=$(Version);LicenseSource=$(License);BinarySource=$(Source);Edition=$(Edition);SaslSource=$(SaslSource);SslSource=$(SslSource);SnmpSource=$(SnmpSource);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode);Flavor=$(Flavor);ClientSource=$(ClientSource);EnterpriseLicenseSource=$(EnterpriseLicense)</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 3b068e051e6..bf47d33019b 100644
--- a/buildscripts/packaging/msi/buildenterprisemsi.bat
+++ b/buildscripts/packaging/msi/buildenterprisemsi.bat
@@ -3,6 +3,7 @@ SET VERSION=2.6.0
 SET BINDIR=..\..\..\build\win32\64\dynamic-windows\extrapathdyn_c__Utils_sasl_c__Utils_snmp_c__Utils_ssl\release\ssl\mongo

 SET CLIENTLIBDIR=..\..\..\build\win32\64\dynamic-windows\extrapathdyn_c__Utils_sasl_c__Utils_snmp_c__Utils_ssl\release\ssl\client_build

 SET LICENSEDIR=..\..\..\distsrc

+SET ENTERPRISELICENSEDIR=..\..\..\src\mongo\db\modules\subscription\distsrc

 SET EDITION=Enterprise

 SET FLAVOR=2008R2Plus

 SET SASLDIR=..\..\..\..\..\..\Utils\sasl\bin

@@ -39,10 +40,14 @@ IF NOT "%1"=="" (
         SET CLIENTLIBDIR=%2

         SHIFT

     )

+    IF "%1"=="-enterpriselicensedir" (

+        SET ENTERPRISELICENSEDIR=%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% MongoDB_64.wixproj
\ No newline at end of file
+%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%;EnterpriseLicense=%ENTERPRISELICENSEDIR% MongoDB_64.wixproj
\ No newline at end of file
diff --git a/buildscripts/packaging/msi/wxs/FeatureFragment.wxs b/buildscripts/packaging/msi/wxs/FeatureFragment.wxs
index 8fde7201086..2f8e9fb8410 100755
--- a/buildscripts/packaging/msi/wxs/FeatureFragment.wxs
+++ b/buildscripts/packaging/msi/wxs/FeatureFragment.wxs
@@ -6,7 +6,7 @@
                Title="!(wix.ProductName)"

                Description="!(wix.ProductName)"

                Level="1">

-        <ComponentRef Id="c_License" />

+        <ComponentGroupRef Id="cg_License" />

         <Feature Id="Server"

                  Title ="Server"

                  Description="The MongoDB server (mongod)"

diff --git a/buildscripts/packaging/msi/wxs/LicensingFragment.wxs b/buildscripts/packaging/msi/wxs/LicensingFragment.wxs
index 7d287a31cb6..c21edc79ee6 100755
--- a/buildscripts/packaging/msi/wxs/LicensingFragment.wxs
+++ b/buildscripts/packaging/msi/wxs/LicensingFragment.wxs
@@ -2,18 +2,43 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

 	<Fragment>

     

-    <DirectoryRef Id="INSTALLLOCATION">      

-      <Component Id="c_License" Guid="54C0700D-A294-4F40-A396-04CC606A7299">

-        <File Id="f_GnuLicense" Name="GNU-AGPL-3.0" Source="$(var.LicenseSource)\GNU-AGPL-3.0"

-              DiskId ="1" KeyPath="yes" />

+    <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.EnterpriseLicenseSource)\LICENSE.txt"

+                DiskId ="1" KeyPath="yes" />

+        </Component>

+      <?else?>

+        <Component Id="c_License" Guid="54C0700D-A294-4F40-A396-04CC606A7299">

+          <File Id="f_GnuLicense" Name="GNU-AGPL-3.0" Source="$(var.LicenseSource)\GNU-AGPL-3.0"

+                DiskId ="1" KeyPath="yes" />

+        </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>

 

-    <WixVariable Id="WixUILicenseRtf" Value=".\GNU-AGPL-3.0.rtf" />

+    <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?>

+    </ComponentGroup>

+

+    <?if $(var.Edition) = Enterprise ?>

+      <WixVariable Id="WixUILicenseRtf" Value="$(var.EnterpriseLicenseSource)\LICENSE.rtf" />

+    <?else ?>

+      <WixVariable Id="WixUILicenseRtf" Value=".\GNU-AGPL-3.0.rtf" />

+    <?endif ?>

 

   </Fragment>

 </Wix>
\ No newline at end of file