Revert "SERVER-14440 Introduce support for OpenSSL in Windows Server 2008 R2+ SSL MSI"

This reverts commit 9144f84e621f5e1ffde55579851180be5f8653ab.

3 files changed, 17 insertions, 52 deletions

diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript
index a5264a3390a..b8ac5ef712a 100644
--- a/src/mongo/installer/msi/SConscript
+++ b/src/mongo/installer/msi/SConscript
@@ -40,6 +40,8 @@ enterprisebase = 'src\mongo\db\modules\enterprise'
 # msi_flavor - "2008R2Plus" or ""
 #
 
+
+
 # Enterprise
 if 'enterprise' in env['MONGO_MODULES']:
   msi_edition = 'Enterprise'
@@ -48,10 +50,7 @@ if 'enterprise' in env['MONGO_MODULES']:
   upgrade_code = 'F395569E-9DD4-49E6-AE8B-16B22BBFE915'
 # Community
 else:
-  if 'MONGO_SSL' in env['CPPDEFINES']:
-    msi_edition = 'SSL'
-  else:
-    msi_edition = 'Standard'
+  msi_edition = 'Standard'
   if env['PROCESSOR_ARCHITECTURE'] == 'i386':
     msi_platform = 'x86'
     msi_flavor = ''
@@ -60,18 +59,11 @@ else:
     msi_platform = 'x64'
     if env.get('WIN_VERSION_MIN') == 'ws08r2' or env.get('WIN_VERSION_MIN') == 'win7':
       msi_flavor = '2008R2Plus'
-      if msi_edition == 'SSL':
-        upgrade_code = '3AEC188B-D63E-4344-88BA-23B8539C68D5'
-      else:
-        upgrade_code = 'B5D765D3-7A55-4BD3-9990-A0F85F5DBE2F'
+      upgrade_code = 'B5D765D3-7A55-4BD3-9990-A0F85F5DBE2F'
     else:
       msi_flavor = 'Legacy'
       upgrade_code = '6A44D061-6FA9-438B-8D25-4AF1BBAC61D7'
 
-if msi_edition == 'SSL' and msi_flavor != '2008R2Plus':
-  print "Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms."
-  exit(1)
-
 if msi_platform == 'x64':
   sources.append("wxs/Installer_64.wxs")
   objects.append("$BUILD_DIR/msi/Installer_64.wixobj")
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
index 7f98b989476..edafb528efb 100644
--- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs
+++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
@@ -71,16 +71,6 @@
           <File Id="f_saslPdb" Name="libsasl.pdb" Source="$(var.SaslSource)\libsasl.pdb"
                 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" />
-        </Component>
-        <Component Id="c_snmpPdb" Guid="6AAB0ACE-C354-4D3A-B490-2AA235647AB3">
-          <File Id="f_snmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb"
-                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" />
@@ -89,6 +79,14 @@
           <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" />
+        </Component>
+        <Component Id="c_snmpPdb" Guid="6AAB0ACE-C354-4D3A-B490-2AA235647AB3">
+          <File Id="f_snmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb"
+                DiskId="1" KeyPath="yes" />
+        </Component>
       <?endif ?>
     </DirectoryRef>
     <?if $(var.Edition) = Enterprise ?>
@@ -116,14 +114,14 @@
       </DirectoryRef>
     <?endif ?>
 
-
-    <?if $(var.Edition) = Enterprise or $(var.Edition) = SSL ?>
+    <!--
+    Only use VC redistributable on builds with /MD - for now, just Enterprise 
+    -->
+    <?if $(var.Edition) = Enterprise ?>
       <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" />
@@ -141,12 +139,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 93a0076c741..a07b300dba9 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 or $(var.Edition) = SSL ?>
+        <?if $(var.Edition) = Enterprise ?>
           <MergeRef Id="m_vcredist"/>
         <?endif?>
         <ComponentGroupRef Id="cg_License" />
@@ -20,9 +20,6 @@
           <?if $(var.Edition) = Enterprise ?>
             <ComponentGroupRef Id="cg_EnterpriseServer" />
           <?endif ?>
-          <?if $(var.Edition) = SSL ?>
-            <ComponentGroupRef Id="cg_SSLBase" />
-          <?endif ?>
         </Feature>
         <Feature Id="Client"
                  Title ="Client"
@@ -32,9 +29,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"
@@ -45,9 +39,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"
@@ -60,9 +51,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"
@@ -73,9 +61,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"
@@ -88,9 +73,6 @@
           <?if $(var.Edition) = Enterprise ?>
             <ComponentGroupRef Id="cg_EnterpriseBase" />
           <?endif ?>
-          <?if $(var.Edition) = SSL ?>
-            <ComponentGroupRef Id="cg_SSLBase" />
-          <?endif ?>
         </Feature>
       </Feature>
     </FeatureGroup>