diff options
Diffstat (limited to 'src/mongo/installer/msi')
| -rw-r--r-- | src/mongo/installer/msi/SConscript | 15 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 57 | ||||
| -rw-r--r-- | src/mongo/installer/msi/wxs/FeatureFragment.wxs | 13 |
3 files changed, 3 insertions, 82 deletions
diff --git a/src/mongo/installer/msi/SConscript b/src/mongo/installer/msi/SConscript index 73b4bb80130..3eac6faa899 100644 --- a/src/mongo/installer/msi/SConscript +++ b/src/mongo/installer/msi/SConscript @@ -8,9 +8,6 @@ Import("windows") Import("mongoCodeVersion") Import("s3push") -# Build an msi -driverIncludeSource = "$BUILD_DIR/msi/DriverInclude.wxs" - env = env.Clone() env['WIX'] = os.environ.get('WIX') env['WIXPATH'] = r'$WIX\bin' @@ -20,24 +17,16 @@ env['WIXLIGHT'] = r'$WIXPATH\light.exe' env['WIXUIEXT'] = r'$WIXPATH\WixUIExtension.dll' env['MERGEMODULESBASEPATH'] = os.environ.get('MERGEMODULESBASEPATH') -sources = [ driverIncludeSource, - "wxs/BinaryFragment.wxs", +sources = [ "wxs/BinaryFragment.wxs", "wxs/FeatureFragment.wxs", "wxs/LicensingFragment.wxs", "wxs/Installer_64.wxs" ] -objects = [ "$BUILD_DIR/msi/DriverInclude.wixobj", - "$BUILD_DIR/msi/BinaryFragment.wixobj", +objects = [ "$BUILD_DIR/msi/BinaryFragment.wixobj", "$BUILD_DIR/msi/FeatureFragment.wixobj", "$BUILD_DIR/msi/LicensingFragment.wixobj", "$BUILD_DIR/msi/Installer_64.wixobj" ] -# heat: slurp up the headers and generate a WiX file listing them as things to include in msi -env.Command(driverIncludeSource, "$INSTALL_DIR/include/mongo/", - '"$WIXHEAT" dir $SOURCE -gg -g1 -frag -cg cg_DriverHeaders' - ' -nologo -directoryid -out $TARGET -dr Header -srd -var var.ClientHeaderSource') - -env.AlwaysBuild(driverIncludeSource) # Need to do this in order to get scons to translate path separators into native format buildDir = Dir(env["BUILD_DIR"]).path diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs index 2ff2f943336..d6e8412760d 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -100,53 +100,6 @@ DiskId="1" KeyPath="yes" /> </Component> <?endif ?> - <Directory Id="Driver" Name="Driver"> - <Component Id="c_mongoclientlib" Guid="B0AF30BE-924F-47C7-A2B9-AE22E0BFCEC1"> - <File Id="f_mongoclientlib" Name="mongoclient.lib" Source="$(var.ClientSource)\mongoclient.lib" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_mongoclientdll" Guid="0B202F31-C173-4D59-A31E-1DD87C16EDC6"> - <File Id="f_mongoclientdll" Name="mongoclient.dll" Source="$(var.ClientSource)\mongoclient.dll" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_mongoclientpdb" Guid="C1AA694E-FC9B-4540-8C73-638BDC2CD7A5"> - <File Id="f_mongoclientpdb" Name="mongoclient.pdb" Source="$(var.ClientSource)\mongoclient.pdb" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_mongoclientexp" Guid="E95F4011-1E88-4A53-807F-F43175864EAF"> - <File Id="f_mongoclientexp" Name="mongoclient.exp" Source="$(var.ClientSource)\mongoclient.exp" - DiskId="1" KeyPath="yes" /> - </Component> - <?if $(var.Edition) = Enterprise ?> - <Component Id="c_driversasl" Guid="E51F24ED-3464-4B01-B825-C9F1219181A0"> - <File Id="f_driversasl" Name="libsasl.dll" Source="$(var.SaslSource)\libsasl.dll" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_driversaslPdb" Guid="1D6BF915-8E12-47FA-A582-64BF9D77EBC5"> - <File Id="f_driversaslPdb" Name="libsasl.pdb" Source="$(var.SaslSource)\libsasl.pdb" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_driverssleay" Guid="B2C36398-A79C-4ADE-BA72-7E3DF85B2D28"> - <File Id="f_driverssleay" Name="ssleay32.dll" Source="$(var.SslSource)\ssleay32.dll" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_driverlibeay" Guid="B7E3243C-25F4-4358-A420-2BFFA0BAABED"> - <File Id="f_driverlibeay" Name="libeay32.dll" Source="$(var.SslSource)\libeay32.dll" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_driversnmp" Guid="57DB53E1-C7B1-4E9C-816E-A7C920DCF393"> - <File Id="f_driverssnmp" Name="netsnmp.dll" Source="$(var.SnmpSource)\netsnmp.dll" - DiskId="1" KeyPath="yes" /> - </Component> - <Component Id="c_driversnmpPdb" Guid="CACC153D-8167-4C9D-B47B-764F254A6BDF"> - <File Id="f_driversnmpPdb" Name="netsnmp.pdb" Source="$(var.SnmpSource)\netsnmp.pdb" - DiskId="1" KeyPath="yes" /> - </Component> - <?endif ?> - <Directory Id="Include" Name="include"> - <Directory Id="Header" Name="mongo" /> - </Directory> - </Directory> </DirectoryRef> <!-- @@ -171,14 +124,6 @@ <ComponentRef Id="c_snmpConfSubagent" /> <ComponentRef Id="c_snmpMib" /> </ComponentGroup> - <ComponentGroup Id="cg_DriverEnterprise"> - <ComponentRef Id="c_driversasl" /> - <ComponentRef Id="c_driversaslPdb" /> - <ComponentRef Id="c_driverssleay" /> - <ComponentRef Id="c_driverlibeay" /> - <ComponentRef Id="c_driversnmp" /> - <ComponentRef Id="c_driversnmpPdb" /> - </ComponentGroup> <?endif ?> </Fragment> -</Wix>
\ No newline at end of file +</Wix> diff --git a/src/mongo/installer/msi/wxs/FeatureFragment.wxs b/src/mongo/installer/msi/wxs/FeatureFragment.wxs index 842c179ab21..a07b300dba9 100644 --- a/src/mongo/installer/msi/wxs/FeatureFragment.wxs +++ b/src/mongo/installer/msi/wxs/FeatureFragment.wxs @@ -74,19 +74,6 @@ <ComponentGroupRef Id="cg_EnterpriseBase" /> <?endif ?> </Feature> - <Feature Id="CPlusPlusDriver" - Title ="C++ Driver" - Description="MongoDB C++ Driver" - Level ="1000"> - <ComponentRef Id="c_mongoclientlib"/> - <ComponentRef Id="c_mongoclientdll"/> - <ComponentRef Id="c_mongoclientpdb"/> - <ComponentRef Id="c_mongoclientexp"/> - <?if $(var.Edition) = Enterprise ?> - <ComponentGroupRef Id="cg_DriverEnterprise" /> - <?endif ?> - <ComponentGroupRef Id="cg_DriverHeaders"/> - </Feature> </Feature> </FeatureGroup> </Fragment> |