diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2014-08-29 10:31:12 -0400 |
|---|---|---|
| committer | Benety Goh <benety@mongodb.com> | 2014-08-29 10:49:54 -0400 |
| commit | 9144f84e621f5e1ffde55579851180be5f8653ab (patch) | |
| tree | 6422f9b3eefbf880f4caea63334480fb7909d6c8 /src/mongo/installer/msi/wxs | |
| parent | 6e98f5003ff06369aec221c9c9dda264d4dee013 (diff) | |
| download | mongo-9144f84e621f5e1ffde55579851180be5f8653ab.tar.gz | |
SERVER-14440 Introduce support for OpenSSL in Windows Server 2008 R2+ SSL MSI
Closes #762
Signed-off-by: Benety Goh <benety@mongodb.com>
Diffstat (limited to 'src/mongo/installer/msi/wxs')
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 33 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 20 |
2 files changed, 40 insertions, 13 deletions
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index edafb528efb..7f98b989476 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -71,14 +71,6 @@ <File Id="f_saslPdb" Name="libsasl.pdb" Source="$(var.SaslSource)\libsasl.pdb" DiskId="1" KeyPath="yes" /> </Component> - <Component Id="c_ssleay" Guid="8879033A-F4F7-4879-A7F8-4D81355A47E3"> - <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_snmp" Guid="F5E5A889-FC9F-4B9A-BEFD-C8ABC9A92D8D"> <File Id="f_ssnmp" Name="netsnmp.dll" Source="$(var.SnmpSource)\netsnmp.dll" DiskId="1" KeyPath="yes" /> @@ -88,6 +80,16 @@ DiskId="1" KeyPath="yes" /> </Component> <?endif ?> + <?if $(var.Edition) = Enterprise Or $(var.Edition) = SSL ?> + <Component Id="c_ssleay" Guid="8879033A-F4F7-4879-A7F8-4D81355A47E3"> + <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> + <?endif ?> </DirectoryRef> <?if $(var.Edition) = Enterprise ?> <DirectoryRef Id="SNMP"> @@ -114,14 +116,14 @@ </DirectoryRef> <?endif ?> - <!-- - Only use VC redistributable on builds with /MD - for now, just Enterprise - --> - <?if $(var.Edition) = Enterprise ?> + + <?if $(var.Edition) = Enterprise or $(var.Edition) = SSL ?> <DirectoryRef Id="TARGETDIR"> <Merge Id="m_vcredist" SourceFile="$(var.MergeModulesBasePath)\Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0"/> </DirectoryRef> + <?endif ?> + <?if $(var.Edition) = Enterprise ?> <ComponentGroup Id="cg_EnterpriseBase"> <ComponentRef Id="c_sasl" /> <ComponentRef Id="c_saslPdb" /> @@ -139,5 +141,12 @@ <ComponentRef Id="c_snmpMongodbincMib" /> </ComponentGroup> <?endif ?> + + <?if $(var.Edition) = SSL ?> + <ComponentGroup Id="cg_SSLBase"> + <ComponentRef Id="c_ssleay" /> + <ComponentRef Id="c_libeay" /> + </ComponentGroup> + <?endif ?> </Fragment> </Wix> diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs index a07b300dba9..93a0076c741 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -7,7 +7,7 @@ Description="!(wix.ProductName)" Level="1" ConfigurableDirectory="INSTALLLOCATION"> - <?if $(var.Edition) = Enterprise ?> + <?if $(var.Edition) = Enterprise or $(var.Edition) = SSL ?> <MergeRef Id="m_vcredist"/> <?endif?> <ComponentGroupRef Id="cg_License" /> @@ -20,6 +20,9 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseServer" /> <?endif ?> + <?if $(var.Edition) = SSL ?> + <ComponentGroupRef Id="cg_SSLBase" /> + <?endif ?> </Feature> <Feature Id="Client" Title ="Client" @@ -29,6 +32,9 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> <?endif ?> + <?if $(var.Edition) = SSL ?> + <ComponentGroupRef Id="cg_SSLBase" /> + <?endif ?> </Feature> <Feature Id="MonitoringTools" Title ="Monitoring Tools" @@ -39,6 +45,9 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> <?endif ?> + <?if $(var.Edition) = SSL ?> + <ComponentGroupRef Id="cg_SSLBase" /> + <?endif ?> </Feature> <Feature Id="ImportExportTools" Title ="Import/Export Tools" @@ -51,6 +60,9 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> <?endif ?> + <?if $(var.Edition) = SSL ?> + <ComponentGroupRef Id="cg_SSLBase" /> + <?endif ?> </Feature> <Feature Id="Router" Title ="Router" @@ -61,6 +73,9 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> <?endif ?> + <?if $(var.Edition) = SSL ?> + <ComponentGroupRef Id="cg_SSLBase" /> + <?endif ?> </Feature> <Feature Id="MiscellaneousTools" Title ="Miscellaneous Tools" @@ -73,6 +88,9 @@ <?if $(var.Edition) = Enterprise ?> <ComponentGroupRef Id="cg_EnterpriseBase" /> <?endif ?> + <?if $(var.Edition) = SSL ?> + <ComponentGroupRef Id="cg_SSLBase" /> + <?endif ?> </Feature> </Feature> </FeatureGroup> |