SERVER-27458 SERVER-28322 Remove outdated builders

6 files changed, 23 insertions, 126 deletions

diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript
index 563779cf5f4..59a871e978a 100644
--- a/src/mongo/installer/msi/SConscript
+++ b/src/mongo/installer/msi/SConscript
@@ -41,43 +41,23 @@ enterpriseToolBuildDir = buildDir + r'\mongo\db\modules\enterprise'
 # msi_flavor - "2008R2Plus" or ""
 #
 
+msi_flavor = '2008R2Plus'
+msi_platform = 'x64'
+
 # Enterprise
 if 'enterprise' in env['MONGO_MODULES']:
   msi_edition = 'Enterprise'
-  msi_flavor = '2008R2Plus'
-  msi_platform = 'x64'
   upgrade_code = '822C75A4-40BA-456B-91D3-C339155F0F90'
 # Community
 else:
   if has_option('ssl'):
     msi_edition = 'SSL'
+    upgrade_code = 'FDAA2775-060E-4C54-9C19-A84197F3070D'
   else:
     msi_edition = 'Standard'
-  if env['TARGET_ARCH'] == 'i386':
-    msi_platform = 'x86'
-    msi_flavor = ''
-    upgrade_code = '480C63DF-8F9F-46BE-BD24-F16E9E992F4D'
-  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 = 'FDAA2775-060E-4C54-9C19-A84197F3070D'
-      else:
-        upgrade_code = '7BCCBD4E-AC8A-48BC-9922-E9EBB158A060'
-    else:
-      msi_flavor = 'Legacy'
-      upgrade_code = '3433D310-B4A0-4E5B-BB38-34FC140F06F1'
-
-if 'msi' in BUILD_TARGETS and msi_edition == 'SSL' and msi_flavor != '2008R2Plus':
-  print "Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms."
-  print "You must add --win-version-min=ws08r2 to your scons flags"
-  exit(1)
-
-if msi_platform == 'x64':
-  sourcesList.append("Installer_64.wxs")
-else:
-  sourcesList.append("Installer.wxs")
+    upgrade_code = '7BCCBD4E-AC8A-48BC-9922-E9EBB158A060'
+
+sourcesList.append("Installer_64.wxs")
 
 sources = ["wxs/" + file for file in sourcesList]
 objects = ["$BUILD_DIR/msi/" + file.replace(".wxs", ".wixobj") for file in sourcesList]
diff --git a/src/mongo/installer/msi/wxs/Installer.wxs b/src/mongo/installer/msi/wxs/Installer.wxs
deleted file mode 100644
index 634566793a6..00000000000
--- a/src/mongo/installer/msi/wxs/Installer.wxs
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="$(var.ProductId)" 
-           Name="!(wix.ProductName)" 
-           Language="1033" 
-           Version="$(var.MongoDBVersion)" 
-           Manufacturer="MongoDB" 
-           UpgradeCode="$(var.UpgradeCode)">
-
-    <Package InstallerVersion="200" Compressed="yes" />
-    <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion)" />
-    <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion)" />
-    <WixVariable Id="InstallFolder" Value="$(var.MongoDBMajorVersion)"/>
-
-    <MajorUpgrade
-      DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="ProgramFilesFolder">
-            <Directory Id="MongoDB" Name="MongoDB">
-                <Directory Id="Server" Name="Server">
-                    <Directory Id="INSTALLLOCATION" Name="!(wix.InstallFolder)">
-                      <Directory Id="BIN" Name="bin" />
-                    </Directory>
-                </Directory>
-            </Directory>
-        </Directory>
-    </Directory>
-
-    <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)Dialog.bmp" />
-    <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)Banner.bmp" />
-    <WixVariable Id="WixUIInfoIco" Value="$(var.ProjectDir)Installer_Icon_32x32.ico" />
-    <WixVariable Id="WixUIExclamationIco" Value="$(var.ProjectDir)Installer_Icon_32x32.ico" />
-    <!--
-    <WixVariable Id="WixUINewIco" Value="Installer_Icon_16x16.ico" />
-    <WixVariable Id="WixUIUpIco" Value="Installer_Icon_16x16.ico" />
-  More information can be found at http://wix.tramontana.co.hu/tutorial/user-interface/ui-wizardry
-    -->
-
-    <Property Id="ARPPRODUCTICON" Value="MongoDBIcon" />
-    <Property Id="ARPHELPLINK" Value="http://www.mongodb.org/" />
-    <Property Id="ARPURLINFOABOUT" Value="http://www.mongodb.org/" />
-
-    <Icon Id="MongoDBIcon" SourceFile="$(var.ProjectDir)Installer_Icon_32x32.ico" />
-
-    <FeatureGroupRef Id="fg_MongoDBAll" />
-
-    <UIRef Id="MongoWixUI" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
-
-    <Property Id="MONGO_MULTIPLE_SKU" >
-        <RegistrySearch Id="Mongo_Multiple_Sku"
-            Root="HKLM"
-            Key="Software\MongoDB\Server\$(var.MongoDBMajorVersion)"
-            Name="Edition"
-            Type="raw" />
-    </Property>
-
-    <Condition Message="You cannot install multple editions for the same version of MongoDB. Already installed product '[MONGO_MULTIPLE_SKU]' conflicts with this product.">
-        Installed OR (NOT MONGO_MULTIPLE_SKU OR MONGO_MULTIPLE_SKU = "!(wix.ProductMajorName)")
-    </Condition>
-  </Product>
-</Wix>
diff --git a/src/mongo/installer/msi/wxs/Installer_64.wxs b/src/mongo/installer/msi/wxs/Installer_64.wxs
index 3cac7a33378..83426028ad6 100644
--- a/src/mongo/installer/msi/wxs/Installer_64.wxs
+++ b/src/mongo/installer/msi/wxs/Installer_64.wxs
@@ -12,28 +12,14 @@
     <WixVariable Id="InstallFolder" Value="$(var.MongoDBMajorVersion)"/>
 
     <?if $(var.Edition) = Enterprise ?>
-      <?if $(var.Flavor) = 2008R2Plus?>
-        <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) Enterprise (64 bit)" />
-        <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) $(var.Flavor) Enterprise (64 bit)" />
-      <?else?>
-        <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) Enterprise (64 bit)" />
-        <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) Enterprise (64 bit)" />
-      <?endif?>
+      <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) Enterprise (64 bit)" />
+      <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) $(var.Flavor) Enterprise (64 bit)" />
     <?elseif $(var.Edition) = SSL ?>
-      <?if $(var.Flavor) = 2008R2Plus?>
-        <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) SSL (64 bit)" />
-        <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) $(var.Flavor) SSL (64 bit)" />
-      <?else?>
-        <?error SSL edition is not supported ?>
-      <?endif?>
+      <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) SSL (64 bit)" />
+      <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) $(var.Flavor) SSL (64 bit)" />
     <?else?>
-      <?if $(var.Flavor) = 2008R2Plus?>
-        <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) (64 bit)" />
-        <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) $(var.Flavor) (64 bit)" />
-      <?else?>
-        <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) (64 bit)" />
-        <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) (64 bit)" />
-      <?endif?>
+      <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) (64 bit)" />
+      <WixVariable Id="ProductMajorName" Value="MongoDB $(var.MongoDBMajorVersion) $(var.Flavor) (64 bit)" />
     <?endif?>
 
     <MajorUpgrade
diff --git a/src/mongo/platform/windows_basic.h b/src/mongo/platform/windows_basic.h
index 372630ffd5f..710d47007c4 100644
--- a/src/mongo/platform/windows_basic.h
+++ b/src/mongo/platform/windows_basic.h
@@ -46,11 +46,11 @@
 #if !defined(_WIN32_WINNT)
 // Can't use symbolic versions here, since we may not have seen sdkddkver.h yet.
 #if defined(_WIN64)
-// 64-bit builds default to Windows Server 2003 support.
-#define _WIN32_WINNT 0x0502
+// 64-bit builds default to Windows 7/Windows Server 2008 R2 support.
+#define _WIN32_WINNT 0x0601
 #else
-// 32-bit builds default to Windows XP support.
-#define _WIN32_WINNT 0x0501
+// 32-bit builds default to Windows 7/Windows Server 2008 R2 support.
+#define _WIN32_WINNT 0x0601
 #endif
 #endif
 
@@ -59,11 +59,11 @@
 #if !defined(NTDDI_VERSION)
 // Can't use symbolic versions here, since we may not have seen sdkddkver.h yet.
 #if defined(_WIN64)
-// 64-bit builds default to Windows Server 2003 SP 2 support.
-#define NTDDI_VERSION 0x05020200
+// 64-bit builds default to Windows 7/Windows Server 2008 R2 support.
+#define NTDDI_VERSION 0x06010000
 #else
-// 32-bit builds default to Windows XP SP 3 support.
-#define NTDDI_VERSION 0x05010300
+// 32-bit builds default to Windows 7/Windows Server 2008 R2 support.
+#define NTDDI_VERSION 0x06010000
 #endif
 #endif
 
@@ -114,6 +114,6 @@
 #error "MongoDB requires Windows SDK 8.1 or higher to build"
 #endif
 
-#if !defined(NTDDI_VISTA) || NTDDI_VERSION < NTDDI_VISTA
-#error "MongoDB does not support Windows versions older than Windows Vista"
+#if !defined(NTDDI_WIN7) || NTDDI_VERSION < NTDDI_WIN7
+#error "MongoDB does not support Windows versions older than Windows 7/Windows Server 2008 R2."
 #endif
diff --git a/src/mongo/util/resource_constants.h.in b/src/mongo/util/resource_constants.h.in
index 729f4bd4d82..fdd42d224ee 100644
--- a/src/mongo/util/resource_constants.h.in
+++ b/src/mongo/util/resource_constants.h.in
@@ -51,8 +51,6 @@
 
 #if (NTDDI_VERSION >= NTDDI_WIN7)
     #define MONGO_PRODUCT_WINDOWS_VERSION "Windows 7/Windows Server 2008 R2";
-#elif (NTDDI_VERSION >= NTDDI_VISTA)
-    #define MONGO_PRODUCT_WINDOWS_VERSION "Windows Vista/Windows Server 2008";
 #else
     #error This targeted Windows version is not supported
 #endif  // NTDDI_VERSION
diff --git a/src/mongo/util/version_impl.cpp b/src/mongo/util/version_impl.cpp
index e9226ac6f24..e1e891f83c1 100644
--- a/src/mongo/util/version_impl.cpp
+++ b/src/mongo/util/version_impl.cpp
@@ -83,8 +83,6 @@ public:
 #if defined(_WIN32)
 #if (NTDDI_VERSION >= NTDDI_WIN7)
         return "Windows 7/Windows Server 2008 R2";
-#elif (NTDDI_VERSION >= NTDDI_VISTA)
-        return "Windows Vista/Windows Server 2008";
 #else
 #error This targeted Windows version is not supported
 #endif  // NTDDI_VERSION