SERVER-10870 - Include SNMP configuration files for mongod.

Also removed snmp dlls getting installed for non mongod components

4 files changed, 23 insertions, 15 deletions

diff --git a/buildscripts/packaging/msi/MongoDB_64.wixproj b/buildscripts/packaging/msi/MongoDB_64.wixproj
index dc8010f6d98..95674551814 100755
--- a/buildscripts/packaging/msi/MongoDB_64.wixproj
+++ b/buildscripts/packaging/msi/MongoDB_64.wixproj
@@ -23,14 +23,14 @@
     <Edition Condition=" '$(Edition)' == '' ">Standard</Edition>

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

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

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

+    <EnterpriseBase Condition=" '$(EnterpriseBase)' == '' ">..\..\..\src\mongo\db\modules\subscription</EnterpriseBase>

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

     <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);EnterpriseLicenseSource=$(EnterpriseLicense);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)</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 a9e999902cd..e1880d3b1fd 100644
--- a/buildscripts/packaging/msi/buildenterprisemsi.bat
+++ b/buildscripts/packaging/msi/buildenterprisemsi.bat
@@ -3,11 +3,11 @@ 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 ENTERPRISEBASEDIR=..\..\..\src\mongo\db\modules\subscription

 SET EDITION=Enterprise

 SET FLAVOR=2008R2Plus

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

-SET OPENSSLDIR=..\..\..\..\..\..\Utils\ssl\bin

+SET OPENSSLDIR=..\..\..\..\..\..\Utils\openssl\bin

 SET SNMPDIR=..\..\..\..\..\..\Utils\snmp\bin

 SET CLIENTHEADERDIR=..\..\..\build\win32\normal\client_build\include

 

@@ -41,8 +41,8 @@ IF NOT "%1"=="" (
         SET CLIENTLIBDIR=%2

         SHIFT

     )

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

-        SET ENTERPRISELICENSEDIR=%2

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

+        SET ENTERPRISEBASEDIR=%2

         SHIFT

     )

     IF "%1"=="-clientheaderdir" (

@@ -55,4 +55,4 @@ IF NOT "%1"=="" (
 

 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%;EnterpriseLicense=%ENTERPRISELICENSEDIR%;ClientHeaderSource=%CLIENTHEADERDIR% 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%;EnterpriseBase=%ENTERPRISEBASEDIR%;ClientHeaderSource=%CLIENTHEADERDIR% MongoDB_64.wixproj

diff --git a/buildscripts/packaging/msi/wxs/BinaryFragment.wxs b/buildscripts/packaging/msi/wxs/BinaryFragment.wxs
index 1e7fce2e3b4..b763c9f6049 100755
--- a/buildscripts/packaging/msi/wxs/BinaryFragment.wxs
+++ b/buildscripts/packaging/msi/wxs/BinaryFragment.wxs
@@ -75,10 +75,10 @@
           <File Id="f_ssleay" Name="ssleay32.dll" Source="$(var.SslSource)\ssleay32.dll"

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

         </Component>

-      <Component Id="c_libeay" Guid="E6CC6AA5-AC71-45EC-803C-71F816E33135">

-        <File Id="f_libeay" Name="libeay32.dll" Source="$(var.SslSource)\libeay32.dll"

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

-      </Component>

+        <Component Id="c_libeay" Guid="E6CC6AA5-AC71-45EC-803C-71F816E33135">

+          <File Id="f_libeay" Name="libeay32.dll" Source="$(var.SslSource)\libeay32.dll"

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

+        </Component>

         <Component Id="c_snmp" Guid="F5E5A889-FC9F-4B9A-BEFD-C8ABC9A92D8D">

           <File Id="f_ssnmp" Name="netsnmp.dll" Source="$(var.SnmpSource)\netsnmp.dll"

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

@@ -87,6 +87,14 @@
           <File Id="f_snmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb"

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

         </Component>

+        <Component Id="c_snmpConf" Guid="4DD0CAD3-97AB-4C11-987A-7ABCFF0D340C">

+          <File Id="f_snmpConf" Name="mongod.conf" Source="$(var.EnterpriseBase)\docs\mongod.conf"

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

+        </Component>

+        <Component Id="c_snmpMib" Guid="F3E98C6B-FE42-44E7-8A1F-E47BDDD0A3D7">

+          <File Id="f_snmpMib" Name="MONGO-MIB.txt" Source="$(var.EnterpriseBase)\docs\MONGO-MIB.txt"

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

+        </Component>

       <?endif ?>

       <Directory Id="Driver" Name="Driver">

         <Component Id="c_mongoclientlib" Guid="B0AF30BE-924F-47C7-A2B9-AE22E0BFCEC1">

@@ -141,13 +149,13 @@
         <ComponentRef Id="c_saslPdb" />

         <ComponentRef Id="c_ssleay" />

         <ComponentRef Id="c_libeay" />

-        <ComponentRef Id="c_snmp" />

-        <ComponentRef Id="c_snmpPdb" />

       </ComponentGroup>

       <ComponentGroup Id="cg_EnterpriseServer">

         <ComponentGroupRef Id="cg_EnterpriseBase" />

         <ComponentRef Id="c_snmp" />

         <ComponentRef Id="c_snmpPdb" />

+        <ComponentRef Id="c_snmpConf" />

+        <ComponentRef Id="c_snmpMib" />

       </ComponentGroup>

     <ComponentGroup Id="cg_DriverEnterprise">

       <ComponentRef Id="c_driversasl" />

diff --git a/buildscripts/packaging/msi/wxs/LicensingFragment.wxs b/buildscripts/packaging/msi/wxs/LicensingFragment.wxs
index c21edc79ee6..00600663a97 100755
--- a/buildscripts/packaging/msi/wxs/LicensingFragment.wxs
+++ b/buildscripts/packaging/msi/wxs/LicensingFragment.wxs
@@ -5,7 +5,7 @@
     <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"

+          <File Id="f_EnterpriseLicense" Name="LICENSE.txt" Source="$(var.EnterpriseBase)\distsrc\LICENSE.txt"

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

         </Component>

       <?else?>

@@ -35,7 +35,7 @@
     </ComponentGroup>

 

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

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

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

     <?else ?>

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

     <?endif ?>