diff options
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 11 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/Installer.wxs | 8 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/Installer_64.wxs | 12 |
3 files changed, 23 insertions, 8 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index e0b1d70770b..b6ddc026b88 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -16,6 +16,9 @@ env['WIXCANDLE'] = r'$WIXPATH\candle.exe' env['WIXLIGHT'] = r'$WIXPATH\light.exe' env['WIXUIEXT'] = r'$WIXPATH\WixUIExtension.dll' env['MERGEMODULESBASEPATH'] = os.environ.get('MERGEMODULESBASEPATH') +if env['MERGEMODULESBASEPATH'] == None and os.environ.get('ProgramFiles(x86)') != None: + env['MERGEMODULESBASEPATH'] = (os.environ.get('ProgramFiles(x86)') + + r"\Common Files\Merge Modules") sources = [ "wxs/BinaryFragment.wxs", "wxs/FeatureFragment.wxs", @@ -31,11 +34,11 @@ buildDir = Dir(env["BUILD_DIR"]).path enterprisebase = 'src\mongo\db\modules\enterprise' -# Set up parameters to pass to wix - +# Set up parameters to pass to wix - # # msi_edition - "Enterprise" or "Standard" # msi_platform - "x64" or "x86" -# msi_flavor - "2008R2Plus" or "" +# msi_flavor - "2008R2Plus" or "" # @@ -53,7 +56,7 @@ else: msi_flavor = '' else: msi_platform = 'x64' - if env.get('WIN_VERSION_MIN') == 'ws08r2': + if env.get('WIN_VERSION_MIN') == 'ws08r2' or env.get('WIN_VERSION_MIN') == 'win7': msi_flavor = '2008R2Plus' else: msi_flavor = 'Legacy' @@ -66,7 +69,7 @@ else: objects.append("$BUILD_DIR/msi/Installer.wixobj") # candle: compile .wxs files into .wixobjs -env.Command(objects, +env.Command(objects, sources, '"$WIXCANDLE" -wx' # cannot have anything other than x.x.x.x in version string. diff --git a/src/mongo/installer/msi/wxs/Installer.wxs b/src/mongo/installer/msi/wxs/Installer.wxs index 969f0df4364..9cdd275ceed 100644 --- a/src/mongo/installer/msi/wxs/Installer.wxs +++ b/src/mongo/installer/msi/wxs/Installer.wxs @@ -7,7 +7,7 @@ Manufacturer="MongoDB" UpgradeCode="$(var.UpgradeCode)"> - <Package InstallerVersion="200" Compressed="yes" /> + <Package InstallerVersion="200" Compressed="yes" /> <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion)" /> <WixVariable Id="InstallFolder" Value="MongoDB $(var.MongoDBVersion) $(var.Edition)"/> @@ -30,6 +30,12 @@ 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="WixUI_Mondo" /> diff --git a/src/mongo/installer/msi/wxs/Installer_64.wxs b/src/mongo/installer/msi/wxs/Installer_64.wxs index 1b5f48b9d16..56e6ff92aad 100644 --- a/src/mongo/installer/msi/wxs/Installer_64.wxs +++ b/src/mongo/installer/msi/wxs/Installer_64.wxs @@ -13,7 +13,7 @@ <?else?> <WixVariable Id="InstallFolder" Value="MongoDB $(var.MongoDBVersion) $(var.Edition) Legacy"/> <?endif?> - + <?if $(var.Edition) = Enterprise ?> <?if $(var.Flavor) = 2008R2Plus?> <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) $(var.Flavor) Enterprise (64 bit)" /> @@ -27,7 +27,7 @@ <WixVariable Id="ProductName" Value="MongoDB $(var.MongoDBVersion) (64 bit)" /> <?endif?> <?endif?> - + <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFiles64Folder"> <Directory Id="INSTALLLOCATION" Name="!(wix.InstallFolder)"> @@ -48,8 +48,14 @@ More information can be found at http://wix.tramontana.co.hu/tutorial/user-interface/ui-wizardry --> - <FeatureGroupRef Id="fg_MongoDBAll" /> + <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="WixUI_Mondo" /> <UIRef Id="WixUI_ErrorProgressText" /> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /> |