diff options
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | etc/evergreen.yml | 468 | ||||
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 34 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/Installer.wxs | 65 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/Installer_64.wxs | 26 | ||||
| -rw-r--r-- | src/mongo/platform/windows_basic.h | 20 | ||||
| -rw-r--r-- | src/mongo/util/resource_constants.h.in | 2 | ||||
| -rw-r--r-- | src/mongo/util/version_impl.cpp | 2 |
8 files changed, 103 insertions, 515 deletions
diff --git a/SConstruct b/SConstruct index 1912cd2daf7..1548f5b6fdf 100644 --- a/SConstruct +++ b/SConstruct @@ -435,7 +435,6 @@ add_option('osx-version-min', ) win_version_min_choices = { - 'vista' : ('0600', '0000'), 'win7' : ('0601', '0000'), 'ws08r2' : ('0601', '0000'), 'win8' : ('0602', '0000'), diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 7fdfe500a26..1cdfb8fa214 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -4821,242 +4821,6 @@ buildvariants: # Windows buildvariants # ########################################### -- name: windows-64 - display_name: Windows Vista - run_on: - - windows-64-vs2015-small - batchtime: 1440 # 1 day - expansions: - platform_decompress: unzip - exe: ".exe" - push_path: win32 - push_bucket: downloads.mongodb.org - push_name: win32 - push_arch: x86_64 - msi_target: msi - content_type: application/zip - compile_flags: --release -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) - python: python - num_jobs_available: $(grep -c ^processor /proc/cpuinfo) - ext: zip - use_scons_cache: true - tasks: - - name: compile - distros: - - windows-64-vs2015-large - - name: compile_all - distros: - - windows-64-vs2015-large - - name: aggregation - - name: aggregation_WT - - name: auth - - name: auth_WT - - name: dbtest - - name: dbtest_WT - - name: disk - - name: disk_WT - - name: durability - - name: failpoints - - name: gle_auth - - name: gle_auth_WT - - name: gle_auth_write_cmd - - name: gle_auth_write_cmd_WT - - name: gle_auth_basics_passthrough - - name: gle_auth_basics_passthrough_WT - - name: gle_auth_basics_passthrough_write_cmd - - name: gle_auth_basics_passthrough_write_cmd_WT - - name: sharding_gle_auth_basics_passthrough - - name: sharding_gle_auth_basics_passthrough_WT - - name: sharding_gle_auth_basics_passthrough_write_cmd - - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - - name: jsCore - - name: jsCore_WT - - name: jsCore_compatibility - - name: jsCore_compatibility_WT - - name: jsCore_decimal - - name: jsCore_decimal_WT - - name: jstestfuzz - - name: jstestfuzz_WT - - name: jstestfuzz_concurrent - - name: jstestfuzz_concurrent_WT - - name: jstestfuzz_concurrent_replication - - name: jstestfuzz_concurrent_replication_WT - - name: jstestfuzz_concurrent_sharded - - name: jstestfuzz_concurrent_sharded_WT - - name: jstestfuzz_replication - - name: jstestfuzz_replication_WT - - name: jstestfuzz_sharded - - name: jstestfuzz_sharded_WT - - name: mmap - - name: mongosTest - - name: noPassthrough - - name: noPassthrough_WT - - name: noPassthroughWithMongod - - name: noPassthroughWithMongod_WT - - name: bulk_gle_passthrough - - name: bulk_gle_passthrough_WT - - name: parallel - - name: parallel_WT - - name: parallel_compatibility - - name: parallel_compatibility_WT - - name: concurrency - - name: concurrency_WT - - name: concurrency_replication - - name: concurrency_replication_WT - - name: concurrency_sharded - - name: concurrency_sharded_WT - - name: concurrency_simultaneous - - name: concurrency_simultaneous_WT - - name: replica_sets - - name: replica_sets_WT - - name: replica_sets_jscore_passthrough - - name: replica_sets_jscore_passthrough_WT - - name: master_slave - - name: master_slave_WT - - name: master_slave_jscore_passthrough - - name: master_slave_jscore_passthrough_WT - - name: sharding - - name: sharding_WT - - name: slow1 - - name: slow1_WT - - name: serial_run - - name: serial_run_WT - - name: sharded_collections_jscore_passthrough - - name: sharded_collections_jscore_passthrough_WT - - name: sharding_jscore_passthrough - - name: sharding_jscore_passthrough_WT - - name: sharding_jscore_passthrough_wire_ops_WT - - name: tool - - name: tool_WT - - name: push - distros: - - rhel70-small - -- name: windows-64-2k8 - display_name: Windows 2008R2 - run_on: - - windows-64-vs2015-small - batchtime: 1440 # 1 day - expansions: - platform_decompress: unzip - exe: ".exe" - push_path: win32 - push_bucket: downloads.mongodb.org - push_name: win32 - push_arch: x86_64-2008plus - multiversion_platform_arch: "windows/x86_64-2008plus" - msi_target: msi - content_type: application/zip - compile_flags: --release --win-version-min=ws08r2 -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) MONGO_DISTMOD=2008plus - python: python - num_jobs_available: $(grep -c ^processor /proc/cpuinfo) - ext: zip - use_scons_cache: true - tasks: - - name: compile - distros: - - windows-64-vs2015-large - - name: compile_all - distros: - - windows-64-vs2015-large - - name: aggregation - - name: aggregation_WT - - name: aggregation_read_concern_majority_passthrough_WT - - name: aggregation_sharded_collections_passthrough_WT - - name: auth - - name: auth_WT - - name: dbtest - - name: dbtest_WT - - name: disk - - name: disk_WT - - name: durability - - name: failpoints - - name: gle_auth - - name: gle_auth_WT - - name: gle_auth_write_cmd - - name: gle_auth_write_cmd_WT - - name: gle_auth_basics_passthrough - - name: gle_auth_basics_passthrough_WT - - name: gle_auth_basics_passthrough_write_cmd - - name: gle_auth_basics_passthrough_write_cmd_WT - - name: sharding_gle_auth_basics_passthrough - - name: sharding_gle_auth_basics_passthrough_WT - - name: sharding_gle_auth_basics_passthrough_write_cmd - - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - - name: jsCore - - name: jsCore_WT - - name: jsCore_compatibility - - name: jsCore_compatibility_WT - - name: jsCore_compression - - name: jsCore_decimal - - name: jsCore_decimal_WT - - name: jstestfuzz - - name: jstestfuzz_WT - - name: jstestfuzz_concurrent - - name: jstestfuzz_concurrent_WT - - name: jstestfuzz_concurrent_replication - - name: jstestfuzz_concurrent_replication_WT - - name: jstestfuzz_concurrent_sharded - - name: jstestfuzz_concurrent_sharded_WT - - name: jstestfuzz_replication - - name: jstestfuzz_replication_WT - - name: jstestfuzz_sharded - - name: jstestfuzz_sharded_WT - - name: mmap - - name: mongosTest - - name: multiversion - - name: multiversion_auth - - name: multiversion_WT - - name: multiversion_multistorage_engine - - name: noPassthrough - - name: noPassthrough_WT - - name: noPassthroughWithMongod - - name: noPassthroughWithMongod_WT - - name: bulk_gle_passthrough - - name: bulk_gle_passthrough_WT - - name: parallel - - name: parallel_WT - - name: parallel_compatibility - - name: parallel_compatibility_WT - - name: concurrency - - name: concurrency_WT - - name: concurrency_replication - - name: concurrency_replication_WT - - name: concurrency_sharded - - name: concurrency_sharded_WT - - name: concurrency_simultaneous - - name: concurrency_simultaneous_WT - - name: read_concern_linearizable_passthrough - - name: read_concern_linearizable_passthrough_WT - - name: read_concern_majority_passthrough_WT - - name: replica_sets - - name: replica_sets_WT - - name: replica_sets_compression - - name: replica_sets_jscore_passthrough - - name: replica_sets_jscore_passthrough_WT - - name: master_slave - - name: master_slave_WT - - name: master_slave_jscore_passthrough - - name: master_slave_jscore_passthrough_WT - - name: sharding - - name: sharding_WT - - name: sharding_compression - - name: slow1 - - name: slow1_WT - - name: serial_run - - name: serial_run_WT - - name: sharded_collections_jscore_passthrough - - name: sharded_collections_jscore_passthrough_WT - - name: sharding_jscore_passthrough - - name: sharding_jscore_passthrough_WT - - name: sharding_jscore_passthrough_wire_ops_WT - - name: sharding_last_stable_mongos_and_mixed_shards - - name: tool - - name: tool_WT - - name: push - distros: - - rhel70-small - - name: windows-64-2k8-debug display_name: "! Windows 2008R2 DEBUG" run_on: @@ -5205,8 +4969,8 @@ buildvariants: - name: tool - name: tool_WT -- name: enterprise-windows-64 - display_name: "* Enterprise Windows" +- name: enterprise-windows-64-2k8 + display_name: "* Enterprise Windows 2008R2" modules: - enterprise run_on: @@ -5275,8 +5039,8 @@ buildvariants: distros: - rhel70-small -- name: enterprise-windows-64-inmem - display_name: Enterprise Windows (inMemory) +- name: enterprise-windows-64-2k8-inmem + display_name: Enterprise Windows 2008R2 (inMemory) modules: - enterprise run_on: @@ -5368,18 +5132,39 @@ buildvariants: - windows-64-vs2015-large - name: aggregation - name: aggregation_WT + - name: aggregation_read_concern_majority_passthrough_WT + - name: aggregation_sharded_collections_passthrough_WT - name: auth - name: auth_WT + - name: bulk_gle_passthrough + - name: bulk_gle_passthrough_WT + - name: concurrency + - name: concurrency_WT + - name: concurrency_replication + - name: concurrency_replication_WT + - name: concurrency_sharded + - name: concurrency_sharded_WT + - name: concurrency_simultaneous + - name: concurrency_simultaneous_WT - name: dbtest - name: dbtest_WT - name: disk - name: disk_WT - name: durability - name: failpoints + - name: gle_auth + - name: gle_auth_WT + - name: gle_auth_basics_passthrough + - name: gle_auth_basics_passthrough_WT + - name: gle_auth_basics_passthrough_write_cmd + - name: gle_auth_basics_passthrough_write_cmd_WT + - name: gle_auth_write_cmd + - name: gle_auth_write_cmd_WT - name: jsCore - name: jsCore_WT - name: jsCore_compatibility - name: jsCore_compatibility_WT + - name: jsCore_compression - name: jsCore_decimal - name: jsCore_decimal_WT - name: jstestfuzz @@ -5394,49 +5179,53 @@ buildvariants: - name: jstestfuzz_replication_WT - name: jstestfuzz_sharded - name: jstestfuzz_sharded_WT + - name: master_slave + - name: master_slave_WT + - name: master_slave_jscore_passthrough + - name: master_slave_jscore_passthrough_WT - name: mmap - name: mongosTest + - name: multiversion + - name: multiversion_WT + - name: multiversion_auth + - name: multiversion_multistorage_engine - name: noPassthrough - - name: noPassthrough_WT - name: noPassthroughWithMongod - name: noPassthroughWithMongod_WT - - name: bulk_gle_passthrough - - name: bulk_gle_passthrough_WT + - name: noPassthrough_WT - name: parallel - name: parallel_WT - name: parallel_compatibility - name: parallel_compatibility_WT - - name: concurrency - - name: concurrency_WT - - name: concurrency_replication - - name: concurrency_replication_WT - - name: concurrency_sharded - - name: concurrency_sharded_WT - - name: concurrency_simultaneous - - name: concurrency_simultaneous_WT + - name: read_concern_linearizable_passthrough + - name: read_concern_linearizable_passthrough_WT + - name: read_concern_majority_passthrough_WT - name: replica_sets - name: replica_sets_WT + - name: replica_sets_compression - name: replica_sets_jscore_passthrough - name: replica_sets_jscore_passthrough_WT - - name: master_slave - - name: master_slave_WT - - name: master_slave_jscore_passthrough - - name: master_slave_jscore_passthrough_WT - - name: sharding - - name: sharding_WT - - name: slow1 - - name: slow1_WT - name: serial_run - name: serial_run_WT - name: sharded_collections_jscore_passthrough - name: sharded_collections_jscore_passthrough_WT + - name: sharding + - name: sharding_WT + - name: sharding_compression + - name: sharding_gle_auth_basics_passthrough + - name: sharding_gle_auth_basics_passthrough_WT + - name: sharding_gle_auth_basics_passthrough_write_cmd + - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT - name: sharding_jscore_passthrough_wire_ops_WT - - name: tool - - name: tool_WT + - name: sharding_last_stable_mongos_and_mixed_shards + - name: slow1 + - name: slow1_WT - name: ssl - name: sslSpecial + - name: tool + - name: tool_WT - name: push distros: - rhel70-small @@ -5473,17 +5262,18 @@ buildvariants: # OSX buildvariants # ########################################### -- name: osx-107 - display_name: OS X 10.7 +- name: osx-1010-ssl + display_name: SSL OS X 10.10 run_on: - osx-1010 batchtime: 1440 # 1 day expansions: push_path: osx push_bucket: downloads.mongodb.org - push_name: osx + push_name: osx-ssl push_arch: x86_64 - compile_flags: --allocator=system -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" + tooltags: "-tags ssl" + compile_flags: --ssl --allocator=system -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" CPPPATH=/opt/mongodbtoolchain/v2/include python: python2.7 num_jobs_available: 1 build_mongoreplay: true @@ -5492,58 +5282,12 @@ buildvariants: - name: compile_all - name: aggregation - name: aggregation_WT + - name: aggregation_read_concern_majority_passthrough_WT + - name: aggregation_sharded_collections_passthrough_WT - name: auth - name: auth_WT - - name: dbtest - - name: dbtest_WT - - name: disk - - name: disk_WT - - name: durability - - name: failpoints - - name: gle_auth - - name: gle_auth_WT - - name: gle_auth_write_cmd - - name: gle_auth_write_cmd_WT - - name: gle_auth_basics_passthrough - - name: gle_auth_basics_passthrough_WT - - name: gle_auth_basics_passthrough_write_cmd - - name: gle_auth_basics_passthrough_write_cmd_WT - - name: sharding_gle_auth_basics_passthrough - - name: sharding_gle_auth_basics_passthrough_WT - - name: sharding_gle_auth_basics_passthrough_write_cmd - - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - - name: httpinterface - - name: jsCore - - name: jsCore_WT - - name: jsCore_compatibility - - name: jsCore_compatibility_WT - - name: jsCore_compression - - name: jsCore_decimal - - name: jsCore_decimal_WT - - name: jstestfuzz - - name: jstestfuzz_WT - - name: jstestfuzz_concurrent - - name: jstestfuzz_concurrent_WT - - name: jstestfuzz_concurrent_replication - - name: jstestfuzz_concurrent_replication_WT - - name: jstestfuzz_concurrent_sharded - - name: jstestfuzz_concurrent_sharded_WT - - name: jstestfuzz_replication - - name: jstestfuzz_replication_WT - - name: jstestfuzz_sharded - - name: jstestfuzz_sharded_WT - - name: mmap - - name: mongosTest - - name: noPassthrough - - name: noPassthrough_WT - - name: noPassthroughWithMongod - - name: noPassthroughWithMongod_WT - name: bulk_gle_passthrough - name: bulk_gle_passthrough_WT - - name: parallel - - name: parallel_WT - - name: parallel_compatibility - - name: parallel_compatibility_WT - name: concurrency - name: concurrency_WT - name: concurrency_replication @@ -5552,54 +5296,6 @@ buildvariants: - name: concurrency_sharded_WT - name: concurrency_simultaneous - name: concurrency_simultaneous_WT - - name: replica_sets - - name: replica_sets_WT - - name: replica_sets_compression - - name: replica_sets_jscore_passthrough - - name: replica_sets_jscore_passthrough_WT - - name: master_slave - - name: master_slave_WT - - name: master_slave_jscore_passthrough - - name: master_slave_jscore_passthrough_WT - - name: slow1 - - name: slow1_WT - - name: serial_run - - name: serial_run_WT - - name: sharded_collections_jscore_passthrough - - name: sharded_collections_jscore_passthrough_WT - - name: sharding_jscore_passthrough - - name: sharding_jscore_passthrough_WT - - name: sharding_jscore_passthrough_wire_ops_WT - - name: tool - - name: tool_WT - - name: push - distros: - - rhel70-small - -- name: osx-107-ssl - display_name: SSL OS X 10.7 - run_on: - - osx-1010 - batchtime: 1440 # 1 day - expansions: - push_path: osx - push_bucket: downloads.mongodb.org - push_name: osx-ssl - push_arch: x86_64 - tooltags: "-tags ssl" - compile_flags: --ssl --allocator=system -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" CPPPATH=/opt/mongodbtoolchain/v2/include - python: python2.7 - num_jobs_available: 1 - build_mongoreplay: true - tasks: - - name: compile - - name: compile_all - - name: aggregation - - name: aggregation_WT - - name: aggregation_read_concern_majority_passthrough_WT - - name: aggregation_sharded_collections_passthrough_WT - - name: auth - - name: auth_WT - name: dbtest - name: dbtest_WT - name: disk @@ -5608,20 +5304,18 @@ buildvariants: - name: failpoints - name: gle_auth - name: gle_auth_WT - - name: gle_auth_write_cmd - - name: gle_auth_write_cmd_WT - name: gle_auth_basics_passthrough - name: gle_auth_basics_passthrough_WT - name: gle_auth_basics_passthrough_write_cmd - name: gle_auth_basics_passthrough_write_cmd_WT - - name: sharding_gle_auth_basics_passthrough - - name: sharding_gle_auth_basics_passthrough_WT - - name: sharding_gle_auth_basics_passthrough_write_cmd - - name: sharding_gle_auth_basics_passthrough_write_cmd_WT + - name: gle_auth_write_cmd + - name: gle_auth_write_cmd_WT + - name: httpinterface - name: jsCore - name: jsCore_WT - name: jsCore_compatibility - name: jsCore_compatibility_WT + - name: jsCore_compression - name: jsCore_decimal - name: jsCore_decimal_WT - name: jstestfuzz @@ -5636,42 +5330,40 @@ buildvariants: - name: jstestfuzz_replication_WT - name: jstestfuzz_sharded - name: jstestfuzz_sharded_WT + - name: master_slave + - name: master_slave_WT + - name: master_slave_jscore_passthrough + - name: master_slave_jscore_passthrough_WT - name: mmap - name: mongosTest - name: noPassthrough - - name: noPassthrough_WT - name: noPassthroughWithMongod - name: noPassthroughWithMongod_WT - - name: bulk_gle_passthrough - - name: bulk_gle_passthrough_WT + - name: noPassthrough_WT - name: parallel - name: parallel_WT - name: parallel_compatibility - name: parallel_compatibility_WT - - name: concurrency - - name: concurrency_WT - - name: concurrency_replication - - name: concurrency_replication_WT - - name: concurrency_sharded - - name: concurrency_sharded_WT - - name: concurrency_simultaneous - - name: concurrency_simultaneous_WT - name: read_concern_majority_passthrough_WT - name: replica_sets - name: replica_sets_WT + - name: replica_sets_compression - name: replica_sets_jscore_passthrough - name: replica_sets_jscore_passthrough_WT - name: replica_sets_kill_secondaries_jscore_passthrough_WT - - name: master_slave - - name: master_slave_WT - - name: master_slave_jscore_passthrough - - name: master_slave_jscore_passthrough_WT - - name: slow1 - - name: slow1_WT - name: serial_run - name: serial_run_WT + - name: sharded_collections_jscore_passthrough + - name: sharded_collections_jscore_passthrough_WT + - name: sharding_gle_auth_basics_passthrough + - name: sharding_gle_auth_basics_passthrough_WT + - name: sharding_gle_auth_basics_passthrough_write_cmd + - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - name: sharding_jscore_passthrough - name: sharding_jscore_passthrough_WT + - name: sharding_jscore_passthrough_wire_ops_WT + - name: slow1 + - name: slow1_WT - name: ssl - name: sslSpecial - name: tool @@ -5680,8 +5372,8 @@ buildvariants: distros: - rhel70-small -- name: osx-107-debug - display_name: "* OS X 10.7 DEBUG" +- name: osx-1010-debug + display_name: "* OS X 10.10 DEBUG" run_on: - osx-1010 expansions: @@ -5721,8 +5413,8 @@ buildvariants: - name: tool - name: tool_WT -- name: enterprise-osx-107 - display_name: Enterprise OS X 10.7 +- name: enterprise-osx-1010 + display_name: Enterprise OS X 10.10 modules: - enterprise run_on: 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 |