summaryrefslogtreecommitdiff
path: root/src/mongo/installer/msi
diff options
context:
space:
mode:
authorJonathan Reams <jbreams@mongodb.com>2014-09-05 18:27:10 -0400
committerJonathan Reams <jbreams@mongodb.com>2014-09-05 18:27:10 -0400
commit5e97d1e186374cc0d9fc9de605eec39796d885cf (patch)
treef0e9bd42fec57b8df8f3d2b4a40491788c253d53 /src/mongo/installer/msi
parent4e8a57ccaba7e2635e0b553a8d96566f5d0f18a6 (diff)
downloadmongo-5e97d1e186374cc0d9fc9de605eec39796d885cf.tar.gz
SERVER-14440 Bundle openssl with SSL targeted Windows MSI
Diffstat (limited to 'src/mongo/installer/msi')
-rw-r--r--src/mongo/installer/msi/SConscript17
-rw-r--r--src/mongo/installer/msi/wxs/BinaryFragment.wxs33
-rw-r--r--src/mongo/installer/msi/wxs/FeatureFragment.wxs20
3 files changed, 53 insertions, 17 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript
index b8ac5ef712a..227aa87dc11 100644
--- a/src/mongo/installer/msi/SConscript
+++ b/src/mongo/installer/msi/SConscript
@@ -40,8 +40,6 @@ enterprisebase = 'src\mongo\db\modules\enterprise'
# msi_flavor - "2008R2Plus" or ""
#
-
-
# Enterprise
if 'enterprise' in env['MONGO_MODULES']:
msi_edition = 'Enterprise'
@@ -50,7 +48,10 @@ if 'enterprise' in env['MONGO_MODULES']:
upgrade_code = 'F395569E-9DD4-49E6-AE8B-16B22BBFE915'
# Community
else:
- msi_edition = 'Standard'
+ if 'MONGO_SSL' in env['CPPDEFINES']:
+ msi_edition = 'SSL'
+ else:
+ msi_edition = 'Standard'
if env['PROCESSOR_ARCHITECTURE'] == 'i386':
msi_platform = 'x86'
msi_flavor = ''
@@ -59,11 +60,19 @@ else:
msi_platform = 'x64'
if env.get('WIN_VERSION_MIN') == 'ws08r2' or env.get('WIN_VERSION_MIN') == 'win7':
msi_flavor = '2008R2Plus'
- upgrade_code = 'B5D765D3-7A55-4BD3-9990-A0F85F5DBE2F'
+ if msi_edition == 'SSL':
+ upgrade_code = '3AEC188B-D63E-4344-88BA-23B8539C68D5'
+ else:
+ upgrade_code = 'B5D765D3-7A55-4BD3-9990-A0F85F5DBE2F'
else:
msi_flavor = 'Legacy'
upgrade_code = '6A44D061-6FA9-438B-8D25-4AF1BBAC61D7'
+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':
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 edafb528efb..7f98b989476 100644
--- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs
+++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
@@ -71,14 +71,6 @@
<File Id="f_saslPdb" Name="libsasl.pdb" Source="$(var.SaslSource)\libsasl.pdb"
DiskId="1" KeyPath="yes" />
</Component>
- <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>
<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" />
@@ -88,6 +80,16 @@
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">
@@ -114,14 +116,14 @@
</DirectoryRef>
<?endif ?>
- <!--
- Only use VC redistributable on builds with /MD - for now, just Enterprise
- -->
- <?if $(var.Edition) = Enterprise ?>
+
+ <?if $(var.Edition) = Enterprise or $(var.Edition) = SSL ?>
<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" />
@@ -139,5 +141,12 @@
<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 a07b300dba9..93a0076c741 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 ?>
+ <?if $(var.Edition) = Enterprise or $(var.Edition) = SSL ?>
<MergeRef Id="m_vcredist"/>
<?endif?>
<ComponentGroupRef Id="cg_License" />
@@ -20,6 +20,9 @@
<?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseServer" />
<?endif ?>
+ <?if $(var.Edition) = SSL ?>
+ <ComponentGroupRef Id="cg_SSLBase" />
+ <?endif ?>
</Feature>
<Feature Id="Client"
Title ="Client"
@@ -29,6 +32,9 @@
<?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"
@@ -39,6 +45,9 @@
<?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"
@@ -51,6 +60,9 @@
<?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseBase" />
<?endif ?>
+ <?if $(var.Edition) = SSL ?>
+ <ComponentGroupRef Id="cg_SSLBase" />
+ <?endif ?>
</Feature>
<Feature Id="Router"
Title ="Router"
@@ -61,6 +73,9 @@
<?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"
@@ -73,6 +88,9 @@
<?if $(var.Edition) = Enterprise ?>
<ComponentGroupRef Id="cg_EnterpriseBase" />
<?endif ?>
+ <?if $(var.Edition) = SSL ?>
+ <ComponentGroupRef Id="cg_SSLBase" />
+ <?endif ?>
</Feature>
</Feature>
</FeatureGroup>