diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2019-05-10 12:34:01 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2019-05-10 12:34:01 -0400 |
| commit | 6e62efce6a5ff27ba593dcdda6cf5c4b3e61380b (patch) | |
| tree | 590a85ec2fcacdbbfeb97f40d99ed14a4d344bac | |
| parent | e06d151dcbe0aa26167add972f9249e57e654efa (diff) | |
| download | mongo-6e62efce6a5ff27ba593dcdda6cf5c4b3e61380b.tar.gz | |
SERVER-40853 Remove OpenSSL from Windows Packages
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 19 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 25 |
3 files changed, 4 insertions, 45 deletions
diff --git a/SConstruct b/SConstruct index d616bbb08dc..beda0cec47b 100644 --- a/SConstruct +++ b/SConstruct @@ -3198,9 +3198,8 @@ def doConfigure(myenv): else: ssl_provider = "none" - # The Windows build needs the openssl binaries if it targets openssl or includes the tools - # since the tools link against openssl - if conf.env.TargetOSIs('windows') and (ssl_provider == "openssl" or has_option("use-new-tools")): + # The Windows build needs the openssl binaries if it targets openssl + if conf.env.TargetOSIs('windows') and ssl_provider == "openssl": # Add the SSL binaries to the zip file distribution def addOpenSslLibraryToDistArchive(file_name): openssl_bin_path = os.path.normpath(env['WINDOWS_OPENSSL_BIN'].lower()) diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 10ddbc243de..2a03699b614 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -121,16 +121,6 @@ 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">
@@ -182,8 +172,6 @@ <ComponentGroup Id="cg_EnterpriseBase">
<ComponentRef Id="c_sasl" />
<ComponentRef Id="c_saslPdb" />
- <ComponentRef Id="c_ssleay" />
- <ComponentRef Id="c_libeay" />
</ComponentGroup>
<ComponentGroup Id="cg_EnterpriseServer">
<ComponentGroupRef Id="cg_EnterpriseBase" />
@@ -196,12 +184,5 @@ <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 d5454248ab7..1cda49bae1e 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -29,13 +29,10 @@ <ComponentRef Id="c_mongod"/>
<ComponentRef Id="c_mongodPdb"/>
<ComponentRef Id="c_mongodCfg"/>
-
+
<?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseServer" />
<?endif ?>
- <?if $(var.Edition) = SSL ?>
- <ComponentGroupRef Id="cg_SSLBase" />
- <?endif ?>
</Feature>
<Feature Id="ServerService"
Title ="ServerService"
@@ -48,13 +45,10 @@ <ComponentRef Id="c_MONGO_LOG_PATH"/>
<ComponentRef Id="c_mongodPdb"/>
<ComponentRef Id="c_mongodCfg"/>
-
+
<?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseServer" />
<?endif ?>
- <?if $(var.Edition) = SSL ?>
- <ComponentGroupRef Id="cg_SSLBase" />
- <?endif ?>
</Feature>
<Feature Id="Client"
Title ="Client"
@@ -64,9 +58,6 @@ <?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"
@@ -77,9 +68,6 @@ <?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"
@@ -92,9 +80,6 @@ <?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseBase" />
<?endif ?>
- <?if $(var.Edition) = SSL ?>
- <ComponentGroupRef Id="cg_SSLBase" />
- <?endif ?>
</Feature>
<Feature Id="Router"
Title ="Router"
@@ -105,9 +90,6 @@ <?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"
@@ -120,9 +102,6 @@ <ComponentRef Id="c_mongodecrypt"/>
<ComponentRef Id="c_mongoldap"/>
<?endif ?>
- <?if $(var.Edition) = SSL ?>
- <ComponentGroupRef Id="cg_SSLBase" />
- <?endif ?>
</Feature>
<?if $(var.Edition) = Enterprise ?>
<Feature Id="MongoCryptD"
|