diff options
| author | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-09-18 16:22:31 -0400 |
|---|---|---|
| committer | Sridhar Nanjundeswaran <sridhar@10gen.com> | 2013-09-19 11:40:22 -0400 |
| commit | c8f2a70ba8cb346d3bd630319d39c298ed45be5a (patch) | |
| tree | da554423229512141ab3632ba4c15e320ef14659 /buildscripts/packaging | |
| parent | 30f4e0801ab576eda3825ca671062f3736ba0f51 (diff) | |
| download | mongo-c8f2a70ba8cb346d3bd630319d39c298ed45be5a.tar.gz | |
SERVER-10814 - Install enterprise dlls with c++ driver
Diffstat (limited to 'buildscripts/packaging')
| -rwxr-xr-x | buildscripts/packaging/msi/wxs/BinaryFragment.wxs | 42 | ||||
| -rwxr-xr-x | buildscripts/packaging/msi/wxs/FeatureFragment.wxs | 2 |
2 files changed, 39 insertions, 5 deletions
diff --git a/buildscripts/packaging/msi/wxs/BinaryFragment.wxs b/buildscripts/packaging/msi/wxs/BinaryFragment.wxs index 2dacae0dab1..a4ab27b2d43 100755 --- a/buildscripts/packaging/msi/wxs/BinaryFragment.wxs +++ b/buildscripts/packaging/msi/wxs/BinaryFragment.wxs @@ -105,6 +105,32 @@ <File Id="f_mongoclientexp" Name="mongoclient.exp" Source="$(var.ClientSource)\mongoclient.exp"
DiskId="1" KeyPath="yes" />
</Component>
+ <?if $(var.Edition) = Enterprise ?>
+ <Component Id="c_driversasl" Guid="E51F24ED-3464-4B01-B825-C9F1219181A0">
+ <File Id="f_driversasl" Name="libsasl.dll" Source="$(var.SaslSource)\libsasl.dll"
+ DiskId="1" KeyPath="yes" />
+ </Component>
+ <Component Id="c_driversaslPdb" Guid="1D6BF915-8E12-47FA-A582-64BF9D77EBC5">
+ <File Id="f_driversaslPdb" Name="libsasl.pdb" Source="$(var.SaslSource)\libsasl.pdb"
+ DiskId="1" KeyPath="yes" />
+ </Component>
+ <Component Id="c_driverssleay" Guid="B2C36398-A79C-4ADE-BA72-7E3DF85B2D28">
+ <File Id="f_driverssleay" Name="ssleay32.dll" Source="$(var.SslSource)\ssleay32.dll"
+ DiskId="1" KeyPath="yes" />
+ </Component>
+ <Component Id="c_driverlibeay" Guid="B7E3243C-25F4-4358-A420-2BFFA0BAABED">
+ <File Id="f_driverlibeay" Name="libeay32.dll" Source="$(var.SslSource)\libeay32.dll"
+ DiskId="1" KeyPath="yes" />
+ </Component>
+ <Component Id="c_driversnmp" Guid="57DB53E1-C7B1-4E9C-816E-A7C920DCF393">
+ <File Id="f_driverssnmp" Name="netsnmp.dll" Source="$(var.SnmpSource)\netsnmp.dll"
+ DiskId="1" KeyPath="yes" />
+ </Component>
+ <Component Id="c_driversnmpPdb" Guid="CACC153D-8167-4C9D-B47B-764F254A6BDF">
+ <File Id="f_driversnmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb"
+ DiskId="1" KeyPath="yes" />
+ </Component>
+ <?endif ?>
</Directory>
</DirectoryRef>
@@ -117,10 +143,18 @@ <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" />
+ <ComponentGroup Id="cg_EnterpriseServer">
+ <ComponentGroupRef Id="cg_EnterpriseBase" />
+ <ComponentRef Id="c_snmp" />
+ <ComponentRef Id="c_snmpPdb" />
+ </ComponentGroup>
+ <ComponentGroup Id="cg_DriverEnterprise">
+ <ComponentRef Id="c_driversasl" />
+ <ComponentRef Id="c_driversaslPdb" />
+ <ComponentRef Id="c_driverssleay" />
+ <ComponentRef Id="c_driverlibeay" />
+ <ComponentRef Id="c_driversnmp" />
+ <ComponentRef Id="c_driversnmpPdb" />
</ComponentGroup>
<?endif ?>
</Fragment>
diff --git a/buildscripts/packaging/msi/wxs/FeatureFragment.wxs b/buildscripts/packaging/msi/wxs/FeatureFragment.wxs index 2f8e9fb8410..3ff6d19f40a 100755 --- a/buildscripts/packaging/msi/wxs/FeatureFragment.wxs +++ b/buildscripts/packaging/msi/wxs/FeatureFragment.wxs @@ -79,7 +79,7 @@ <ComponentRef Id="c_mongoclientpdb"/>
<ComponentRef Id="c_mongoclientexp"/>
<?if $(var.Edition) = Enterprise ?>
- <ComponentGroupRef Id="cg_EnterpriseBase" />
+ <ComponentGroupRef Id="cg_DriverEnterprise" />
<?endif ?>
</Feature>
</Feature>
|